diff --git a/Manifest b/Manifest
index fb6edb695263..85c3c1a6e49a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29293 BLAKE2B 693f68feac334864eddf127647fe79b338c6d57068c05930ec6d1957341a44861a426f3a7f86e966b1fdb1d44fe87ceeadf829f6a2c8b9fdd0a9e026caea24b8 SHA512 e9c70a0ce7d519c46848e8b46b5bccbb80a48af969d9aec5b609274b4d116dec46945440f47c74d4d478b366faeedd72dfba0114cdf7c56e47dbd1b47e2b6aeb
-TIMESTAMP 2021-12-06T06:39:17Z
+MANIFEST Manifest.files.gz 29295 BLAKE2B cd7249ae53954a01cc51e0222986b66be6d2d42a84e1240129e688e16e017d07cfa608a1efb4979a3eaba79c9b15d8d963c43a9bcda570d0f87c0e17dd300363 SHA512 1042f889aa7b6cfc8067dea6bde80a285b46897e1828d53b0e3a6d1dcf70a4168b39d0eef7323454ba0b31ab796b8ede5ff8bae0a53c50bc0cf2af0dbc260e5f
+TIMESTAMP 2021-12-07T14:39:17Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGtsBVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGvchVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCogRAAtDc2+bgRwUMDLbau5KL35EI5FdmFkPgauceW1/5laDAthWeyZ3DfA9sZ
-dMG62D6CF2U+gLKILvma/YHI45mT6mDVYMNDNWDS+xW6R0qaXPdk8xh+WzLDRVsr
-HB5fZBrQ0XZHnbaNf31DV8v9s3i6SHH7VD0GPFJFSmH5jW44Bk6UYBOqngLptN4u
-z6N6oQ1VV9MKiHZ/KiuiuYMguzr48hBnGYzE4vQKRKPCQ3a3dS+cZPtj4Zez5ptN
-lGhqfG69zZ8KG0V077lKnnCzmc21mOmilZCg3Cr/BmHcQyzJQz/TBPnmQFU+s2pF
-8CQsPOg6Vv1/yWIn4DYxBiR8rIhtcAbx4m6DzruiMm+LR78oicqS+fF6QrYSybyf
-H8KOkEErEHPkxdNJiPidpM0AwkzPig1NyJyfhX8I0XknBWXgN+ZIHovdUqTfQbCG
-FXve1Hqfetpo5d8TtehzOk+kvwiJrO0/WAf5nblbmVSbLSIT0rRBfrJQBBuVJFcF
-6Hx1qmu3QdLW4uNgNsXTcIhrzTjoJYKFzh3SjsQHS44T+7Kj4cm2N6PnV3aTQRyE
-JoTHXWjLJOUY0SOdJNu5BOGQq4g6oeO6xsgniM5RbyVoDu3AXqZg1mKAHN6sOlsH
-QDhFZq8hiZTOIKla+SJrTxnrLU56V2WMY7OSC6AKidhWyn27I+8=
-=JrFs
+klDhEQ//Y4Uwt5tpqZ3R1GVNAFaR4K/cx/92CZz0gLCrLfctLTS3/g8qVfX6dwj9
+uAr7FzRQRfHpJzX/2iNeMl+dIaOpLx9UM3zhbwj+H8buqy6jbeerA3xuVR3XC9PT
+gy5u/uu48NpV1w1/CeeBomUELZ0MvUmKEy9XxjRNdJoJ5XBGZVIiypIWgI7M7vWV
+JxmLxLCeZmE/FLz5HhcM0zdXvrkUHSL5Jo4jXpjc7ct7kxlG4pi2gofnvw/7boWN
+AfExs1m2XeozHhgUN+O1xfHOMTe5/upiWYA9ynPJilTR37GD2JQXyE1H91pxHQwf
+jwcDa0XAdf+Qfj84xl7CGtjzO3MoyAurupd46kq8uAwsOunPiyay3XgP0WurNBu/
+iXVblpX4MyHuqN393qq7w463loCjoVF9mqBPoCbc5PNvWkDWsQBjgyxuDKMxYwnB
+w9JKX/0rYmNOlga1TM62OPWWxoMyXDUdyN3tLcNV1hoHbsjPkhk/MdpBhBzpwokj
+wAs2S25gBQ48qKaVNW1vjH8fdZfCG+/fjQNQFQX/5zkrzOZiXbLnH+4oLV8tidlk
+gBPGTnMtsBZXBEfBlYrIBXOuchcmG1/owOL/HDQQgqfz93+PanqoPEiOdDrHXcjg
++QKcbXGBMwwIyeJUvTZWrM1GTfSevy5g99q1poWiX5vQNKyIjKo=
+=2Rdc
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e478456fcdc9..ca6f5d3660e8 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index fbf9199fbe51..22492efbce31 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/ejabberd/Manifest b/acct-group/ejabberd/Manifest
new file mode 100644
index 000000000000..ff9a5cbd3d38
--- /dev/null
+++ b/acct-group/ejabberd/Manifest
@@ -0,0 +1,2 @@
+EBUILD ejabberd-0.ebuild 192 BLAKE2B 619a3d9ba875a020796bd72c9880a57bfccc663897f1d0790fa270585a602828d5bd9a421b2b9fdb5ac8b72f85223474ac660cd23c1a447522745e438cdb9aaf SHA512 179a1a67a20b7e2a75bc19b43d4d7da39e42c69ac8510e23a8278b60dcd17e6ab161f16d34313640587a16b5d54f1c0c2a7b4955d2cde451abe4240685a07486
+MISC metadata.xml 327 BLAKE2B e2fef9e407b36d9097b4e139fc22f8a390d3a9468ce471d2cea8d4e9cf41a27b52871fe1e62c6986561338948db688aeb115f64e8dfcf542face361b9eb3ccd2 SHA512 650c51220755586eefc829aa8cebd394c198676b347f5c9e3c92f39e1ad8eef847e45c949b6c80457c942c98fcb8f9fe58d651e9fd25b71f9e07c1e052262657
diff --git a/acct-group/ejabberd/ejabberd-0.ebuild b/acct-group/ejabberd/ejabberd-0.ebuild
new file mode 100644
index 000000000000..7d4a216908f8
--- /dev/null
+++ b/acct-group/ejabberd/ejabberd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-im/ejabberd"
+
+ACCT_GROUP_ID=114
diff --git a/acct-group/ejabberd/metadata.xml b/acct-group/ejabberd/metadata.xml
new file mode 100644
index 000000000000..d199a5d1bcc9
--- /dev/null
+++ b/acct-group/ejabberd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ejabberd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index d0da22dbfa6b..e4d69ccdfb07 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/ejabberd/Manifest b/acct-user/ejabberd/Manifest
new file mode 100644
index 000000000000..e98bf091f46d
--- /dev/null
+++ b/acct-user/ejabberd/Manifest
@@ -0,0 +1,2 @@
+EBUILD ejabberd-0.ebuild 236 BLAKE2B fea7d577d255e090cf62c0d2228b1098ff177f9a46943c624aa599739f09089507459ef89beeeb0782ddb129268ec43540be5c03e8a9ff85130e20b568e8b24b SHA512 bd44e80f3c9e3236a9a98a088b4f0891ff647efe40beee1f532b2386f07069d6fbb83f5e5665b0a1b7ae72bdd9db74bd35e7d02ecae74c57729ccaf5fb5c1ee2
+MISC metadata.xml 327 BLAKE2B e2fef9e407b36d9097b4e139fc22f8a390d3a9468ce471d2cea8d4e9cf41a27b52871fe1e62c6986561338948db688aeb115f64e8dfcf542face361b9eb3ccd2 SHA512 650c51220755586eefc829aa8cebd394c198676b347f5c9e3c92f39e1ad8eef847e45c949b6c80457c942c98fcb8f9fe58d651e9fd25b71f9e07c1e052262657
diff --git a/acct-user/ejabberd/ejabberd-0.ebuild b/acct-user/ejabberd/ejabberd-0.ebuild
new file mode 100644
index 000000000000..db8ac6554fa9
--- /dev/null
+++ b/acct-user/ejabberd/ejabberd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-im/ejabberd"
+
+ACCT_USER_ID=114
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps
diff --git a/acct-user/ejabberd/metadata.xml b/acct-user/ejabberd/metadata.xml
new file mode 100644
index 000000000000..d199a5d1bcc9
--- /dev/null
+++ b/acct-user/ejabberd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ejabberd@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 51e581bba43e..6cc88cb60377 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 cad10df37e4a..57d67436ee16 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,6 +5,7 @@ DIST awscli-1.22.17.tar.gz 2123827 BLAKE2B e721c09ed07afcde2026b58623ecfeafd2433
 DIST awscli-1.22.18.tar.gz 2124899 BLAKE2B bf1960c9b24e0f4581e5d495e68b0c4ed69f0d0de29e77709cc9ab50dbf6099a2244d917ec5162cb30f76f30a38a8ae0477f3424a28a9d276afd46b31a8807e1 SHA512 80abf1ff0c89abf308c840856c67888f39220d05b04032f3ae8c9efeb98d6fafb67bbcce804c36515337d0e1b3c6405d7a85fd42cca59030002bb62c89f56070
 DIST awscli-1.22.19.tar.gz 2125676 BLAKE2B 9ff59cf2eb220452744b221a1419f82adc849bb69355ee2716112e87be98e6945af1bdeb8c643ee553003842546677bcc3aca625bfc7c003a539b2b0b0d06743 SHA512 4cbaceeb4db0e3b22327b934f703f3015ccfc368d5e308bd1e5692423b8b802c2ad8ac68ee918dbedb82cd7c5e1209c4aae78c26bed898b9c58c125277001308
 DIST awscli-1.22.20.tar.gz 2126171 BLAKE2B 93c906ae19a1e11eca78e29e4eee99307465e92f22f1fc4ae26552decfc593c928ed036af62bc697404f7e76bb91b039887133df7351911da36693bcb6bd9530 SHA512 80939328c313d201ccfd691962b49c1960805b30b9ee04440c71194ee16b06a6c4190a122a78f5fd925ecbe45d53e89e7921052ad81dfaada4e7a7b9b5d26680
+DIST awscli-1.22.21.tar.gz 2126474 BLAKE2B b1debfea55e0c1f32b191e91ac1627312056573ae0d398ecd8c9efc56d4ef67d65a8d1fd3aca8add8b5583e0791444551987aa23ce95209b068efdff4a2a2b81 SHA512 6b4e7a5d7a789ce55ee6e5073922f275a264ecd1358df2b470b2a789cc334678749acc0031cc8004527686f0d7899d55a8084daf15383c8144dc61a80f079313
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
 EBUILD awscli-1.21.12.ebuild 1351 BLAKE2B 573f4936fc569bfadb330cc29319fc990addee02316f71251fab0c88b76e5de5d67ae9a56d3565b746797899a500d1c8ab5cb84d8c92241afcceb6da23136ca8 SHA512 ea23e1d80d811ff18482ffd933efef06b652f947fad5e4e622104f1dfe2e3a9b2f4a1967dec56a6800e799826490cd2dd804aed47feccbf2001a46be2a6e71d5
 EBUILD awscli-1.22.14.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
@@ -13,5 +14,6 @@ EBUILD awscli-1.22.17.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944
 EBUILD awscli-1.22.18.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.19.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.20.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.21.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.5.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.22.21.ebuild b/app-admin/awscli/awscli-1.22.21.ebuild
new file mode 100644
index 000000000000..85073515ab9a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.21.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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-arch/Manifest.gz b/app-arch/Manifest.gz
index 9f56b4271ff7..4eea606c0abd 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 3da637ff3adc..271cf6206a30 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -2,5 +2,5 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.11.tar.xz 804096 BLAKE2B c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 SHA512 af297c173297d588722f4d0f140a2ae4d3ea3861464191772fb2e11e47be43644b5ae01ed63f0051d6eb4751666284de53e14c4dd9f0c1d25f61cf676fbf11f3
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.11.ebuild 1326 BLAKE2B 2281c6f4606ca8ce376092af60aadb8fa1895096a97cd4b5503354929c4310cca90c40069296ce1a161483099ffbf7d7f7dcdb191bb8deecfec0c5fc28144ba8 SHA512 f1158b379d38558d689940bc579362e1b53c4d3f14ec89c025f572161ce3142510fb1b8e8a627159f92f14b2e8d91bc0888b8aba65dfc58e0e04ac5e803c95cf
+EBUILD gzip-1.11.ebuild 1325 BLAKE2B 7c6d18037fc033ead53c1db4efe45843b6f4fc1db6d14482325e1bb5287fcb9770aa8af87462d286aee0860011f777b01edb69494ee89dd5c26e602dd3bcdee3 SHA512 5336e1076fcbb9f8716c181cb933ee0da8c429a2b5408fcce6e2193cacdc5e8829eb7277fa394dbd8a5450fb70638d284f06a2317984289615a18f3d187e5452
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index ed05ce788461..7055c27c52fb 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 
 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="pic static"
 
 PATCHES=(
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 4d3efda1d551..017dfc9fd194 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -5,5 +5,5 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b5008865298d095a123a010ab70f9e2e3ad9402124afbf8291a3863e9e805c9c65ab47cc435df82a729e81984394bf SHA512 d32af8649c6d47796a645b6ecbe580df97f5423bfb17414d5ed0016373f5cfab86ebcfad6c480fb8bfafaf3a960f9bc095ef6faad7b40bdb208cc60e4080b0c8
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
-EBUILD rpm-4.17.0.ebuild 3907 BLAKE2B 75dbcabb3f88ca971dcfbba26c42ec7589343f487d77d5aebc9bcc247fb2f5d7f68f0565166739ffa9546dce955a7cbe9f301e8e53b0bb0d18df9032892dbb41 SHA512 edb9795d3f3ce31ce4e8dc4de423b475b95161ea22c7de869a854e8b6eb99efe3fc2f6200462fa3d5c9c8f322b9bf2e0e139740b22c1ab40c0a8de92f67858ae
+EBUILD rpm-4.17.0.ebuild 3905 BLAKE2B a1de093f15f925aa568be75a98224b29de1ef49985fc218535fbc20adbd3aaff5c4605a185a76a597dbb079e8f5db0632c64405d412e183e115abfc605146214 SHA512 f49533e216d74577797ce78f7caa22aa395de5aaab0f05a3c4af136052ef7647cf8bbf2bb1b496119952e27a8cd5b5802bcb9f3b2f9622760a924f6f5ba86d1b
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/rpm-4.17.0.ebuild b/app-arch/rpm/rpm-4.17.0.ebuild
index c3ba41520b44..19b33b3904ef 100644
--- a/app-arch/rpm/rpm-4.17.0.ebuild
+++ b/app-arch/rpm/rpm-4.17.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # Tests are broken. See bug 657500
 RESTRICT="test"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ff9599de921e..90dac31ab457 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index d2cd7bcf5118..43906788ce93 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,5 @@
 DIST dar-2.7.1.tar.gz 2290659 BLAKE2B 89fa7ac208eb3009f5151f27022a7a449bb204cb035f320e33ff642588b5ab0389c2ed33b71b7a7c6240d205877073f26a04f0164ce05bb370db3bc3faf25fda SHA512 404e3281b2c420088623e4c6ba262d2a7a44848986e43d4c71aff77104395f1178445d560849a73e0dbacce6b8014df2bb20bc33471ae2d07d897bb6ad577bcc
 DIST dar-2.7.2.tar.gz 2294187 BLAKE2B 6422f40aea9fe07195359d9e8d5a947fe20d1ec4d6bd866eb8e9240c153d069b5df75018c25b9e8ce6b7acbf4ce4259b50b0768cd391d8b9b1c7be72f03a56b6 SHA512 7e41adc0102806c07d644da41960b1e5bcb6b7872e6a5789506c1f2a001ffb4e3607cae6f76ccc2339d90cf4387b7645e9de6dbc4eed1306827a46e4b7c9d09d
 EBUILD dar-2.7.1.ebuild 2227 BLAKE2B 895d91efff0477b33aceb86ef3f007e71b6ffef85954e84c3617037863c658f3c8a810b5ceba94a5a6d896e40dc942165b6ea5a0b46dde2282a444ce986d99b0 SHA512 fb2e0d595a169d0cb7d29dbe398ef61acbc9fcb6b110d14ebf3ef7adc54e36891a1eae12dd5bf6560a115fab5b2b7004edfbbb1f5b8089c34a29e014cadca614
-EBUILD dar-2.7.2.ebuild 2229 BLAKE2B ac867027e420528aca73025218925a046cad1e8d52b68ce5bcd70aea37fcbc81cb268091116f580d360e1bea25d2ef76b093f2c96992e4c9f76ffc6608b68f2e SHA512 2672c3a1157290e175d6688207b1687ec5180f2128374af57034090ddfb49b91022061c4bdd26f8b25669c0814142962e1cdc5a7435482828d79912575838c74
+EBUILD dar-2.7.2.ebuild 2227 BLAKE2B 3b2c94f212a3b83753ff1187098d820f776745b7ed20f78fd0f1d5a20682faff9d193b0d5966e7c032626b60906f0ff94fe0b1b908dc936c7c15537b1587ea5e SHA512 b5621fa636ee83fdaf47b86ffb123157a43b73f983857b7d165077a19a22726b9ddebc1b8b123f19d126528b38f34b17b2de50e7303ac464d07f81923592d47a
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.2.ebuild b/app-backup/dar/dar-2.7.2.ebuild
index 34812ed773b5..ccbb6731f19a 100644
--- a/app-backup/dar/dar-2.7.2.ebuild
+++ b/app-backup/dar/dar-2.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr"
 
 REQUIRED_USE="?? ( dar32 dar64 )
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 2406fcb4407a..d93da0f88f14 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,14 +1,6 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
-AUX snapper-0.8.15-testsuite.patch 2528 BLAKE2B c68cb221ade1d281f0d8bdfc5b4853d1bd3f6409ac0bca56ed9348968f2f5f66646105e2158a8cb55857afe41ee1078427b953d964b30877e887e40928a0a01b SHA512 29a447e26eb5092f40f5ca097026ca6f62a5c75c5be4ed51ec5a77eff80a25f86ddf0c67f6805a180e45f81c64594908fb5d30a52db68e96e975f40d50a095d2
-AUX snapper-0.9.0-testsuite.patch 2520 BLAKE2B 37a29e0e622a68a3a941a1eaf6244b11d315566c03a61bf88b0a805c434b06d363d242e401cb82d109f07d8566390465f821d80a13c4fc8a593dded7ae567d8b SHA512 0878c41b78c99e3e86357a49dc46819b1296698a2520688268679cb14b376e9ca2e4913ee7627df4b16ab7e179d3b86bcae02198c563e56b94892cfc54078cc9
 AUX snapper-0.9.1-testsuite.patch 2613 BLAKE2B 6fd621d1cab8ee829ba07ee7fac0ca7de884becb6b3ca24e444de4de547866fe2ec1c108fcc6686c8adc78661324445c8f37e82110514b7a7d9b578ede70c7ef SHA512 e447c6062e85f587b084334a5565d02dd89c778985d121e7489f8059a647b22a2e3386992f107f589b60bbfd55036f71efe21651841592073b29981a1451df36
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
-DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c
-DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae
-DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
-EBUILD snapper-0.8.15-r2.ebuild 2050 BLAKE2B 9aa6d6f8b72f680edf08ada7a87850e734a445c2b780403564bf3f1f1b51bebc1d2c02c195dc2ae1dd5214299fa8ff094a2a0e8f6549c053001b970f68d39e3b SHA512 8916ebc3ba6f3bd30a053b5e41d60de1057868f6e102151d0bd137b0af31acebcabfb7fd0922b451edbae4f38b75494a6db481c977eb50f2ab997ee0b141f403
-EBUILD snapper-0.8.16-r1.ebuild 2060 BLAKE2B 08c83366000f96267a5ac13ae7950c3471aa6ced6e88b394340f6c3555d7ebdeb9197a7102c3613d228c1bf7b10e967aa457f8e961c5a24a9c24c751b3ce43d8 SHA512 e295e6a70bc9e0834da1220538d93d2fc78bbdc98bdebddc10b1a272c89d9e5dccb3a6952e49173fd039353d709898cbad07af17e26be4974d3b56f23b1dab89
-EBUILD snapper-0.9.0-r1.ebuild 2057 BLAKE2B 0984ee3f4edacf15fe522d9b9f165056f5cac0beafad3146e460e05a07193d7990bdffb36bde4cb78bfded98c7790482ffe998a46c936dc0f99b9a1bade0448f SHA512 f60866ffd8a1e896372bb993c6aade4f972b8207db7e9ddf44555e8b9c616e0e7cbe9044e8835d90f5c89094b94036ea8adad163defbfdd280d438e94df2fbe7
-EBUILD snapper-0.9.1.ebuild 2059 BLAKE2B 24f81580afeb058a40cc1f6f1ce2a491c026b2a354e4982eec3065b92d6635f64296d852aaf5a1c686150617b9734f0fc0d076c222d0e5ef1545891adca981b1 SHA512 597e80417d5823dbb22543cf5c48e12626979395b7d2f80d59863c34428bd8bec77a24c2a136ebfdc1261c5e30c8bab418e53f0e3a947792f7f780b3b765f70e
+EBUILD snapper-0.9.1.ebuild 2057 BLAKE2B 0984ee3f4edacf15fe522d9b9f165056f5cac0beafad3146e460e05a07193d7990bdffb36bde4cb78bfded98c7790482ffe998a46c936dc0f99b9a1bade0448f SHA512 f60866ffd8a1e896372bb993c6aade4f972b8207db7e9ddf44555e8b9c616e0e7cbe9044e8835d90f5c89094b94036ea8adad163defbfdd280d438e94df2fbe7
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch
deleted file mode 100644
index 237e0705c98d..000000000000
--- a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 839d012..ceac54d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
- 
- CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
- 
-+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
-+		[with_tests=$enableval],[with_tests=yes])
-+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
-+if test "x$with_tests" = "xyes"; then
-+	AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
-+fi
- 
- AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
- 		[with_btrfs=$enableval],[with_btrfs=yes])
-diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
-index 81104bf..9c29477 100644
---- a/testsuite-cmp/Makefile.am
-+++ b/testsuite-cmp/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-cmp
- #
- 
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir)
- AM_LDFLAGS = -lboost_system
- 
-@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
- 
- EXTRA_DIST = $(noinst_SCRIPTS)
- 
-+endif
-diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
-index 717313a..527843d 100644
---- a/testsuite-real/Makefile.am
-+++ b/testsuite-real/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-real
- #
- 
-+if ENABLE_TESTS
- CXXFLAGS += -std=gnu++0x
- 
- AM_CPPFLAGS = -I$(top_srcdir)
-@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
- 
- EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
- 
-+endif
-diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
-index d7e30b8..72ef5ee 100644
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite
- #
- 
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
- 
- LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
-@@ -40,3 +41,4 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils
- getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
- 
- lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
-+endif
-diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
-index 7b52e13..71cb545 100644
---- a/zypp-plugin/testsuite/Makefile.am
-+++ b/zypp-plugin/testsuite/Makefile.am
-@@ -1,3 +1,5 @@
-+
-+if ENABLE_TESTS
- if HAVE_ZYPP
- TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
- 
-@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
- 
- EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
- endif
-+endif
diff --git a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
deleted file mode 100644
index 7aa089569b4a..000000000000
--- a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 06e4721..c89d0aa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
- 
- CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
- 
-+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
-+		[with_tests=$enableval],[with_tests=yes])
-+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
-+if test "x$with_tests" = "xyes"; then
-+	AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
-+fi
- 
- AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
- 		[with_btrfs=$enableval],[with_btrfs=yes])
-diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
-index 81104bf..9c29477 100644
---- a/testsuite-cmp/Makefile.am
-+++ b/testsuite-cmp/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-cmp
- #
- 
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir)
- AM_LDFLAGS = -lboost_system
- 
-@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
- 
- EXTRA_DIST = $(noinst_SCRIPTS)
- 
-+endif
-diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
-index 717313a..527843d 100644
---- a/testsuite-real/Makefile.am
-+++ b/testsuite-real/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-real
- #
- 
-+if ENABLE_TESTS
- CXXFLAGS += -std=gnu++0x
- 
- AM_CPPFLAGS = -I$(top_srcdir)
-@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
- 
- EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
- 
-+endif
-diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
-index ccb84d3..409e265 100644
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite
- #
- 
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
- 
- LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
-@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
- range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
- 
- limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-+endif
-diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
-index 7b52e13..71cb545 100644
---- a/zypp-plugin/testsuite/Makefile.am
-+++ b/zypp-plugin/testsuite/Makefile.am
-@@ -1,3 +1,5 @@
-+
-+if ENABLE_TESTS
- if HAVE_ZYPP
- TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
- 
-@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
- 
- EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
- endif
-+endif
diff --git a/app-backup/snapper/snapper-0.8.15-r2.ebuild b/app-backup/snapper/snapper-0.8.15-r2.ebuild
deleted file mode 100644
index 04ec37fa6255..000000000000
--- a/app-backup/snapper/snapper-0.8.15-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd bash-completion-r1
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc lvm pam test systemd xattr"
-RESTRICT="test"
-
-RDEPEND="dev-libs/boost:=[threads(+)]
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${P}-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		$(use_enable doc)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.8.16-r1.ebuild b/app-backup/snapper/snapper-0.8.16-r1.ebuild
deleted file mode 100644
index 2115112952cc..000000000000
--- a/app-backup/snapper/snapper-0.8.16-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd bash-completion-r1
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lvm pam test systemd xattr"
-RESTRICT="test"
-
-RDEPEND="dev-libs/boost:=[threads(+)]
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${PN}-0.8.15-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		$(use_enable doc)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.9.0-r1.ebuild b/app-backup/snapper/snapper-0.9.0-r1.ebuild
deleted file mode 100644
index e08297c0ff3a..000000000000
--- a/app-backup/snapper/snapper-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd bash-completion-r1
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="doc lvm pam test systemd xattr"
-RESTRICT="test"
-
-RDEPEND="dev-libs/boost:=[threads(+)]
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${P}-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		$(use_enable doc)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.9.1.ebuild b/app-backup/snapper/snapper-0.9.1.ebuild
index 3f1b02d77735..e08297c0ff3a 100644
--- a/app-backup/snapper/snapper-0.9.1.ebuild
+++ b/app-backup/snapper/snapper-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 61f57fe4d75c..bb5190cb0757 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/age/Manifest b/app-crypt/age/Manifest
index 52f942aac877..743b6cc9e767 100644
--- a/app-crypt/age/Manifest
+++ b/app-crypt/age/Manifest
@@ -1,33 +1,17 @@
 DIST age-1.0.0.tar.gz 59682 BLAKE2B 1347f833b2e867bcff5a4738f9444aaf60bdfd4804c0ecd4d60cebde3e90c250554ad9b99b305a48ed29b11439ea2847a06d39fbab3085b8861b22bceea51a42 SHA512 77ea1af03a76339f4e934222bc9fc6119698080d0e03011c79b25119e0e8a1e6c0772ede5069cd63bde48cfaa4d355c897912741680e8b0c52d4c518182c2f7f
-DIST age-1.0.0_rc2.tar.gz 56579 BLAKE2B a92b08261a299da76cb1df133d4a4406bebfbaed08c07746af25b1f7126a244287ca1305acdd7757892a3a0f2c2f0294471bd1af9f7c5fd8ad77f798f40795e9 SHA512 488255ccf268a45f304d3fdcacbf32e214835516900b61e0554fe586bf61161e3bba2b1ee88e732490cdf82118a922c372133c888753d51f4d7afcb80421c088
-DIST age-1.0.0_rc3.tar.gz 59002 BLAKE2B 350dda6ad3e1c3d67d1feec2f93c73c4a12bfd5404f2b3bec9bcfc4c20d6f216667eec795f5fb9f5d3ffbcb1e1239127b3a853f01c72bc1e03bd9c0abf6208d1 SHA512 d5fe881255d07a174b3e325bf58631a4a45c50cc8bbdf0d0711fa6de23c6b3eeb31fc21c549b2921f8f4b1031d0984a2d30f1664a4a483ee604f86dd419c9518
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.mod 40 BLAKE2B bd9471e49922bbabdc776224c508b0b6abe1a140718f37bf99c62c5ec0fe77d94ce3c5d03dcfd673e1df0250779929535cc11f7a44d1e8957627ea6dd99a4702 SHA512 8cbfb9981941ccdb0f1c0848e267a7c4e9b14fbe6d0507e2f4faf3cb1b494657f33eb70bdf07602ed90f39c1d9b3713b7be95cd761f0d7a8f04fa99ece99386e
-DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip 84404 BLAKE2B 8e04457aa65ff295afde6913b152a5294f5e8b2d8c081e4ca89f78cddd9f5013c8528d417877a8eba11ce0ceac885ff968a96777499abfaa3110f0405c27f3ed SHA512 7fb52e1050f25d41d32022a8ab6a7f6bbbcedd47e4fc435311b3c498ea575831a754b9a3ded66dfd8d8d22f768877039285d7093f9e08328574182f3fd07b7fd
 DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.mod 40 BLAKE2B 895e3b61e3e272387257e288b70e2a7d461c0de2ed2284e1909ac2bf2eedf841246e175ed848174ec510c53ae207d801cff7a39c560fd2b0c0b4dc08c67f4856 SHA512 2a56ce66f7ba29cd8f975014291690c2f929738a4a8b93529c2c367c0236b767f92e4f6dfda9fe1fdf981926302d7ab26665f7d64b022a22e5305aea693ad2dc
 DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-rc.1.zip 47154 BLAKE2B 7cbd8e554ff4d2e93b60a81fe77d051b60255f24339fda1be3e644c737b44a1db665e9076193b6c914b6561b29f7d377680a96c15de1970859714abfa08e2dee SHA512 1f008db632f373f72d0be54c2b5669668e8bbfd124f2a56fc6b8368eb89bcd55d2e5669bed6362fe6bfb055016c80002394a7b3a92f33d0fb9d9c11d42be4c61
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip 1876172 BLAKE2B 3b1e29d33ba8af42f20fc885b38014859d3c4d9d688f82354d2165649166a2211ce456afe273d61f302e2c1dab9f2ecbe8afdb0d6fde391e788c4783954bb104 SHA512 bb0e7965c8f5f6910d8d63951b16c23f0a832b2b5ed379b3261207f38dd4e859af47007163f5cea2bf7f8ab618f3e93abd91fcfcb64a942643d5273ea92f38af
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210903071746-97244b99971b.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210903071746-97244b99971b.zip 1658183 BLAKE2B 194970777c3e8907d0ea9e09bad7693e8a3c4c801d8fd730c420e7a1682f61f1ea0a63620dbc2b460a1a9da79181f422d76a17087f967b14a5dce26a1753463b SHA512 819b6d3ac1247566bb377c71f4993e32186f5b4b21667479744896ff8de186d7dffd1a1c4612943ce9ee7fc62fcd0e55f602eb56c252b29bca57e9431dc6507d
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip 21403 BLAKE2B f95e96b20328a04dd2a3a20985bf54d0d859a88e45f5f61eaee3f2bc22b575ae37c8ccf7275dbd68ac2851fd0d374f7ff8874ecc44c51629199a846154ed93d8 SHA512 82711ee27037e2ec090919fe58efb173626b31b4bc9e0118d732eb585ba4a16de6f1ee994b97ae78b7ff1cb89c34f6aa7392ff4b3432cf1cf2c56d101c64fec8
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 EBUILD age-1.0.0.ebuild 1526 BLAKE2B 97ea25b37ac4b3c313f14d2fbd60e280f76bae319ba572cae9746a3f38de15977921cb4923e26f0e260fe5f1652d7f50f836df489306b4f4ce7d5bb7ff4329ad SHA512 22a3a573ba0a76e81ca926c489adaaddc2883cbc15ba975732b619e6b04d71392f313bccd26fc9e14f903222f012162ddf9fae827c2a62aa07c08e8cf902c3fc
-EBUILD age-1.0.0_rc2.ebuild 1455 BLAKE2B b5be3bb0fd9b17ef3591e76c1e481762e3fd8c595c553345cdb1acde7b72f574475afa97d7d5f2ade40c8c931385e301d7f17dc574672146ac2964121d6ebc6f SHA512 d5eab40ccc7b4af09764280f8327c863b2e718df06ea6b2a2db2ba8d2a12cdb6d696f605ecb93571f26f707358d3c995c85545e05b3a763ded7bff283daa6916
-EBUILD age-1.0.0_rc3.ebuild 1455 BLAKE2B b5be3bb0fd9b17ef3591e76c1e481762e3fd8c595c553345cdb1acde7b72f574475afa97d7d5f2ade40c8c931385e301d7f17dc574672146ac2964121d6ebc6f SHA512 d5eab40ccc7b4af09764280f8327c863b2e718df06ea6b2a2db2ba8d2a12cdb6d696f605ecb93571f26f707358d3c995c85545e05b3a763ded7bff283daa6916
 MISC metadata.xml 495 BLAKE2B 8a96af0353f1721a164ab2308f4645dfcf214d5059e9b8897b3b3d57f8df44e1981cf083ae79e04eae04f61c2bb934a2b74a4f89010fc4dad4519fa45fb35c50 SHA512 03ce2c7701e7dcd1c9e73d094a6918da82fd3a792b2ca4ea5f753ad85a78c1bfdf9cc1f98b38ef0a7e9087502e730943f280e0ebb6ada7ac89a3e382d0901e1c
diff --git a/app-crypt/age/age-1.0.0_rc2.ebuild b/app-crypt/age/age-1.0.0_rc2.ebuild
deleted file mode 100644
index 43d7ce74976a..000000000000
--- a/app-crypt/age/age-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="A simple, modern and secure encryption tool (and Go library)"
-HOMEPAGE="https://github.com/FiloSottile/age"
-
-MY_PV=$(ver_cut 1-3)-rc.$(ver_cut 5)
-
-EGO_SUM=(
-"filippo.io/edwards25519 v1.0.0-beta.3"
-"filippo.io/edwards25519 v1.0.0-beta.3/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
-"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/FiloSottile/age/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-S="${WORKDIR}/age-${MY_PV}"
-
-LICENSE="BSD"
-#RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-
-src_compile() {
-	go build -ldflags "-X main.Version=${MY_PV}" -o . filippo.io/age/cmd/... || die
-}
-
-src_test() {
-	go test -race filippo.io/age/cmd/... || die
-}
-
-src_install() {
-	dobin age age-keygen
-	doman doc/age.1 doc/age-keygen.1
-	dodoc README.md
-}
diff --git a/app-crypt/age/age-1.0.0_rc3.ebuild b/app-crypt/age/age-1.0.0_rc3.ebuild
deleted file mode 100644
index 43d7ce74976a..000000000000
--- a/app-crypt/age/age-1.0.0_rc3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="A simple, modern and secure encryption tool (and Go library)"
-HOMEPAGE="https://github.com/FiloSottile/age"
-
-MY_PV=$(ver_cut 1-3)-rc.$(ver_cut 5)
-
-EGO_SUM=(
-"filippo.io/edwards25519 v1.0.0-beta.3"
-"filippo.io/edwards25519 v1.0.0-beta.3/go.mod"
-"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
-"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
-"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
-"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-"golang.org/x/text v0.3.0/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/FiloSottile/age/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-S="${WORKDIR}/age-${MY_PV}"
-
-LICENSE="BSD"
-#RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-
-src_compile() {
-	go build -ldflags "-X main.Version=${MY_PV}" -o . filippo.io/age/cmd/... || die
-}
-
-src_test() {
-	go test -race filippo.io/age/cmd/... || die
-}
-
-src_install() {
-	dobin age age-keygen
-	doman doc/age.1 doc/age-keygen.1
-	dodoc README.md
-}
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 2d44039d9268..c0aa4d4445e3 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -2,6 +2,6 @@ AUX libmd-1.0.3-out-of-source.patch 1147 BLAKE2B f255a1367f89912ba81c69e3e813acc
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
 DIST libmd-1.0.4.tar.xz 264472 BLAKE2B ddc2da74635f5cc009c66a58ae82b83e6e0930e18af8a6b0ecec7cbf378246707b493a99fb97d3491d0d626a0d5ef068baea6a3ba2ec311c5a1516ba5b4e2fd5 SHA512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3
 EBUILD libmd-1.0.3-r2.ebuild 746 BLAKE2B 34cac3a544162234b7f24d277d8310004f324ba47842a3696c27f16266d56a11fb593259b0947293d1d2e7ae7b9c0a5d97afdcc26884199229a29010240c14bf SHA512 dd2e5f1efb04fe6fbd2c6ff1580ace52a66a894a1c0ca28a80201bd8b018f25cce0cc43858c41282877fb8382e7178abe69dab63328ebde14a9453cf4b199fc7
-EBUILD libmd-1.0.4.ebuild 646 BLAKE2B 0dd60ebf94744f7e39feea0c27ed9d1c180691a354c0d752a203092cfb14a263f4c1780fdc9aca84a835bd6111ef52bf6de524363502d804212745bd23a4d147 SHA512 e7d1bdfe7a6210949ff1be6cafe00b7be5f6d4082718fef1b4586666af8e068fcc5f4b46c6b2c818a97f4bc31e5cb357c57f94b7392300dbdba8210beefc865e
+EBUILD libmd-1.0.4.ebuild 644 BLAKE2B 9b28774b7c2258fa129a99876d1ca009f79c9431af8e5db1c54d71d07a0449425cc831f80d78e439fa8410857f5a311d25d6b7ad6877f9e5c3c3aa7872edf9f9 SHA512 12ac426ff92ea5a7429302a5a80b8a8c45a6843f34e0705fbf9ff6f5a409e25323cb44d7b7a712f1168406ffed50d5f9a8c5904b216fc756712233f3687b9cd4
 EBUILD libmd-9999.ebuild 567 BLAKE2B c31c8d0780cd63516fae57497f80340712547fe78d17e16ad8d1c1f7320681ef914d0ffefc459593b2de6e0db054860296c72060bea33a4ef47de42dc3da8a14 SHA512 82345337a69a40c8f7199a3be295b18e530be415c712af1259b4e110f7cc80d50705559ad92ce0b7c001c8f6f95ad7d5fae3d09b3ec527a1b860e8577d078ed6
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index 33c6b5d1b334..9821ee44773e 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 821570d86a81..54436322519d 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -130,5 +130,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 EBUILD nitrocli-0.3.4.ebuild 1551 BLAKE2B 5d0dbaa6766209bfcb3d2c1332a69c395df40377b679f9b42bbf3f58616ffaf51b532a6ee4df185d6c2ae2744c0b18f214027ba4caf0918ef2a69b0565594ab4 SHA512 d774c7b7fd0f92e52572d1fec2f9413d1e683781999336879a89061a68d5f64fb20717e198f4e286a7db9b5b64990e5c21ab4c4c4be3eb659156c7f24eccd760
 EBUILD nitrocli-0.3.5.ebuild 1968 BLAKE2B 5c58af3560e0ca2bfb52b31fff704117b2d5defabcf55aca20efc19d860c52a9f9675086698bfb88394ec3041453030b2e1fdce3fa3a1c68e8a2316af33428db SHA512 f4924b0e13093548c93c12f14dd2472ce3ac39f67525904cca9522c829db27faf768abbe041b1904931963886df92fc240a85602581acb2a4059c40b5d98b20e
 EBUILD nitrocli-0.4.0.ebuild 2343 BLAKE2B 1bf8ad68f2452f1146bbe4bdbaf5a3fd8d18e018d8fd30174a6d04131f7f6a6c68e7abe76143547499bee29875bd6e7641e8d4aa472895b0574f67f4cf706c52 SHA512 ec234f63224e1886b3ceb65642de56badce4641bb0f5501977c8a053f5c9254056dea629fac07e49a9f98aabec606fd60cb4bfdd8e426fc445cefd2b893d014f
-EBUILD nitrocli-0.4.1.ebuild 2156 BLAKE2B 2fc580062505169f509dcc1157f2e85fc8bbbc37fcc53667409e43938666c7ed7208eb49acc82ee6e9a3421a77e6d6c9742c9b0610b43a1b598144804ec05eec SHA512 4788150ac249dcc8c27ca3d9fb5fb6290114c543300bed6219628cfa8b8b22a23fa635f7ab835c4a20af4cf155f199d7d9fa1652b5f39750969042ece47103eb
+EBUILD nitrocli-0.4.1.ebuild 2155 BLAKE2B 68ddd6988558a4a5175e75e94c937a21aa73831af0c547ccb04f656b591f266d2913cb3027ad985e867212019aa102bc196a2d4a680e03d3c47dc9ef016dad10 SHA512 21e0cfd79f9bca772668502bd98b31fe23137010dfacc6cf93aa113b778c3a84c928d579e37a18dad084d2e06cab3e11257fe11e2253f8a21df296b4071d9e8d
 MISC metadata.xml 714 BLAKE2B 115563d48eedaef70ee7aada807a9ffe530336837f3e44d69854ff5b00581d36deb9483cd9e30668f43ab2a74b29cb5cbdef72c7fbc172d6d3fcbfb6d79ef41e SHA512 85dc7dcabdf3442a1aaecf2e893b2983627cb2628e35e3f0b3116ada3aadffa340abb7916a28fe2678c33b503ae5bd9f98d9b5ff0ed0fd2b466ff470409bfbf3
diff --git a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
index 2330f2c61c42..8cb2144f9a0f 100644
--- a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
@@ -76,7 +76,7 @@ SRC_URI="$(cargo_crate_uris)"
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND="
 	dev-libs/hidapi
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index d6dd95ba6750..abeab2e846e0 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -2,5 +2,5 @@ AUX tpm-tools-1.3.9.1-openssl-1.1.patch 6028 BLAKE2B bd7a7b3dc748618004cbbfb7dc5
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 954 BLAKE2B f53bed313b12de4bd985c76d168a110a5f2e66448afb39636f8ccbef173810ec2ce60d0a01a39fb289cdc82b723237e58091b4f561668b77e28144d141592969 SHA512 045475346c2c8778ce588cf8fe893c24eca0c9d6ecf27161a2807f35d47737ba75f16d44d7b3c244b5ce35dc382a24c52ba3bd9c72e48bff9dfd8d488465a40e
-EBUILD tpm-tools-1.3.9.2.ebuild 1097 BLAKE2B 3e282abba4f574492567fcdd94862d6d7d5bdfe2bd31d9098a53f2c65871d18ecd4a4ab946a0cfb0f5ecdf54bb65a4db20dc6815538de615b4394213ed231554 SHA512 615fadc763d95435872c4080c03f0bca4fd812809bb5e197f86e3e8f5a64c66092f93efb91555669c7445cc0cb2a2585571d75f29390b86ffd8536acd4ba06f7
+EBUILD tpm-tools-1.3.9.2.ebuild 1095 BLAKE2B c676d27ccbbfba4a8300371e1ccd1795c5dfe5e37310ff90fde37af65c4caa2001af2ee86c6906106227aca1b18cfa8dd5602d452b80ed9dd9db02fdf098d1cc SHA512 f29bf010947d132c5360183736f48c0817e1723cbdd79ccf5eb6d64881dc156af7a49e0e67d296933cd9c0bfc541aa48064ab083d996940eaa5e4e53fc74b7b4
 MISC metadata.xml 655 BLAKE2B 32c7f70c902ebfbc7f182b4ff474b97163112e4418597f12e2c4f10e082f7803a27948e1cbf17bfea491564a26a1c968fa5d7ec51878eaa79eb3e9598ee51ad9 SHA512 57f1c5a445c98a90025ab2b19fa00b55071bec42e3b130dae8dae203e1a81544cbcf723f8b4d4bfcc47771060e350663bb1c0ea976595c6c044809ed358f7ad0
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
index 5c3f6dd63c64..1f7603f6acb0 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~m68k ~s390 x86"
 IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 8beda79e696e..ce7f1adeac20 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -6,5 +6,5 @@ DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab5759
 DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
 EBUILD tpm2-tss-2.4.5.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
 EBUILD tpm2-tss-2.4.6.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
-EBUILD tpm2-tss-3.1.0.ebuild 1735 BLAKE2B 66f0a275eb0cbbdd2e84e31c21fa5f924eab2be145f1ff52fc9bc6806a9242a0e57c08cfdd6644b3e119857ccd92e96a83ff17efa673e303e7ec82233285f161 SHA512 700ba7587186c397c3aa199d5a967d4d3393770b3e62d57cc81398491aec68f866769bfcf2f1a515250c79cde0a58ad037cbac2526afce8124121b1f7e1ed934
+EBUILD tpm2-tss-3.1.0.ebuild 1732 BLAKE2B a33ff057b9fa12c4075c1c3198b3a83c7ae4be8a5a1d3a5fa904715cadbb15a0447f411eacbfb91862522202b8081b3c86aa874ed4ac2fc0e1af55018658a4b9 SHA512 9959e844996bdca5ed7d4b4be90623b01a27c4036aacd65ab883a757e6be520a896d5b825f00eaa1445b17ebe18c54d83d4046c43e218e046119c5c161381f7a
 MISC metadata.xml 827 BLAKE2B d771c64e37ccd09adbf4c40c412b744b1fdecc5497116e1fb5518f26921195a9141710f4e4d8daaabe6fb9076719bf87c088665fcd6d037d4875bfa761f9bcb6 SHA512 9b1fb93de976edafed96599a093aa4f8058d2542b6dd9be0fb2de5849f77394f2e17b6f4397c14b1dc13b679fb91c38c7852cfaed37908d4c0a2f216a56c659c
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
index 6a784390d5db..00fcac8bc3ae 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="doc +fapi  +openssl mbedtls static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index be5a517a17e8..04b7e0f3e182 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 292e7c048eee..b387a41b472d 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,3 +1,5 @@
 DIST conmon-2.0.30.tar.gz 161285 BLAKE2B c4e01759d819d3dff94b9ae09caa72b6f664e49d907d3a1be9fb4a0e1f782fad29a7cd7c89703e861f4aa6d7955996386f81460f19f22be2889c4f88c34536cb SHA512 2451e441913925f8423385b83e97630e980948a9bd57ae8800889016c4412a26bed598825d3c034c3edcecbab66c38417f55ad3866d3c2c98cada6acce2b2d16
+DIST conmon-2.0.31.tar.gz 158184 BLAKE2B b14bae77a18cc352bc9583604544b4e7ffe4bd8a77e5c3185c897c11819bba227edcbd84b559d998a2b5648ca371f0e98e4d9cd15951a953cbe05a9c9ae9d434 SHA512 ff879fcd5a3b7de8ee6ff9de2a13d0afc36fdb392390278b26ee179be26ff375ddce4f5ae24e3e88b737f63202af64b49e82b2ffbfc0de8bfd14690dac523747
 EBUILD conmon-2.0.30.ebuild 1091 BLAKE2B e824f91e4495954361b47e65b55f916a56bd0391d561158f431c8774253dc558880ffff0ba9219dbc80704e867a6b2e64c29bca329d26f304de783d2fb198f97 SHA512 8973dbf92e9c2a6adb568ace44750e93c988b80b4359b365dec87f40452516418485f53dd47f2502ad84d5effed16b8b0e540628ef8c03bbccd0632985890982
+EBUILD conmon-2.0.31.ebuild 1093 BLAKE2B 1130b19d09380025cd7e24eaea16fcea0ac63fb704c121a1688438a409a47dbb81c6ae35623af674b28b634cb617f74213984ad2dc75a31a8fc8284f17750f2d SHA512 2d4b8bddddefd8a0a0bbc2f392aaca8f2676fde3f5dbcc6e54f9570963fc2a7b257c37abb28a51318bf438a4ba301d5ac64507ee53debe3153dda1c5def2d38b
 MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
diff --git a/app-emulation/conmon/conmon-2.0.31.ebuild b/app-emulation/conmon/conmon-2.0.31.ebuild
new file mode 100644
index 000000000000..0f5ca7319b06
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.31.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake GIT_COMMIT="v${PV}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 158f5b3912b8..fa705e76e8a3 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,6 +2,6 @@ DIST VBoxGuestAdditions_6.1.24.iso 61081600 BLAKE2B 66427a961c83f2de1a0b86710661
 DIST VBoxGuestAdditions_6.1.28.iso 62226432 BLAKE2B 0f2d4076476945466cd5d3c5e3064c0f23e511596933d29cd7bab275ee1a21ac5fb81a4723c342f79946000e97681a5e9875cba006bdee6ec684169abd5e04d9 SHA512 2801c78909bdd38b623e958ce61154da7aa2ababf6e7723baf50e958afd1a8d4b0930800fe5549f728a7ac7979d8fa1597c969bf28743d7266b16ccc1b5960bb
 DIST VBoxGuestAdditions_6.1.30.iso 62238720 BLAKE2B 1459548ad7d4c7ed79a44793d11fc4071a8b043dc0cb9b113775688c254cdfa8f658dcf33fa666c5d4c000357f8a1f8ef0f43268af8f84bd6833e16381e276d1 SHA512 0729275f46b486872f665b264c6ad83a0d42bb2a35ff5e96d9a8449bc9042328219f7533e6ef6ded0351e1fa73024755b32560af13606e808910262c3b133726
 EBUILD virtualbox-additions-6.1.24.ebuild 777 BLAKE2B 839d72d0dce7bc4a40bcc15cb80d1247399f09b20cc2aaa3029759ccf3c5e5e93b184e4fa2928cc503735dcdfa64f583b5b25ef90504354097c5dfa310aaff54 SHA512 ceaa16e9b2905b8174d156433c4709b09cc52dd1ce2f8607fb855ab6ba776e93faf0cf7341cfb7799553c51cfd1b9c8cbe9d57f5d242d4c8a9333ff1e6e44ef8
-EBUILD virtualbox-additions-6.1.28.ebuild 773 BLAKE2B ec536183e374156adace80364b1b41a176a6906634168e87a9de31b57a2dfa131e6acfbffe0cb8397ba1c86108c197783a0a1b2a2bec06a1b358ad61c313ed9b SHA512 f43aba9da3873e6382a9580e2ac13754c582a52fb461b714eab134117ca8a849d205307b5045bf0d65604d0b4163584fd50c4ad5120b6f5cfcedbc0889dda78f
+EBUILD virtualbox-additions-6.1.28.ebuild 772 BLAKE2B f5d898abeeb1285c219e798b62468df428036ccd98836b71e4872baa524af377254cae237d134ca2543deb3109af0b06d3694ecdbf1c8b4fdf3d001894eaa628 SHA512 87618228a4f69bda61aff52fc2c504dbfcf61dde35e923ade17d4243503aadb39c4ce24fb45d27ffb2e981293b7e9209977a64a0bb0490268faae5b0477846dd
 EBUILD virtualbox-additions-6.1.30.ebuild 773 BLAKE2B ec536183e374156adace80364b1b41a176a6906634168e87a9de31b57a2dfa131e6acfbffe0cb8397ba1c86108c197783a0a1b2a2bec06a1b358ad61c313ed9b SHA512 f43aba9da3873e6382a9580e2ac13754c582a52fb461b714eab134117ca8a849d205307b5045bf0d65604d0b4163584fd50c4ad5120b6f5cfcedbc0889dda78f
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
index 4a54ecd35f58..2fc64d0fd7b9 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 05738ee8aea2..be56efbed9cd 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,6 +2,6 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.24.tar.gz 11135003 BLAKE2B 53bb6dc3
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.28.tar.gz 11136237 BLAKE2B 66f09d39a60277358b08f073e3d5836bdb4acddfacc0c5321b19f876d4c5407ed1039b65e22e188690cb6c034aacca2be8d60a52acb8467a6c6319f46c15bb61 SHA512 7e352889469ad678e93d042a5a240820753918cd191c9e164678b84947fba5ae0616fda7f8e6385b2ba525e51948e4860ca91cdd62a2eb503f79acadcb367f2e
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.30.tar.gz 11136343 BLAKE2B c3db50c02da2a9a6ba766bf24103f0f45f073ea65954352fe3a3f01c25974374f6c7f7851e933ce4e5a082ec3944f1c521d74f51e10db5708454bd8817d8f23d SHA512 c525743b2304fe39c66f56147d85a92d4fc884cae007c8b801519e0b5bcbf08c7656ba66befbac63b03ba4d20034899ae4438c263de0bae7a3fd36af1608ea75
 EBUILD virtualbox-extpack-oracle-6.1.24.ebuild 1069 BLAKE2B 46bf0d096f1aa85748656eb44fd646d357c1621272791b343472c3bf6ad5ec87bec0ff9bcbf9b4f692501eb6382a75ff68acdb2fc3c1a2828651dd42dc4190db SHA512 ee701af686a5f260a93699cf4dbb030edbaa8a0dda9479c3d3af977abcb27d033a745dcb16139f1ef1ef7e6cfc20f9e479d08b173ddb340ff3334cacb8813d4a
-EBUILD virtualbox-extpack-oracle-6.1.28.ebuild 1065 BLAKE2B 6728457bdc028b46b989d9d22f557fe7c026f6c2e89628defd10f98552f998e3a3952a5c4f0b259189d9b06cd2a6784fc1552aa14b0661f1ee5567b4231c5ff7 SHA512 7d5e08213780896e7162775760270df178838cfc0bbee7b49449263c94ee0bb504e6bec413c2cff4f185f2ed0f7097112e55e795dbe5d5dc290790685d6e9ed5
+EBUILD virtualbox-extpack-oracle-6.1.28.ebuild 1064 BLAKE2B e01f5010d90e67a21a66c1a87ddbcb56398932106eda833e936b011007f32e57ca1ae190d95b7a1de21fb5eec8c468aa8e6c2a7bf10918b4e73b1788aeb643c2 SHA512 355321c4374bb4be19c9aa34285ad1151621e67f383577df68c5d778b28ecabc1798acdb96c5f63569b48dd6bd9019d46df57f573a7db92bb979cbd806d60963
 EBUILD virtualbox-extpack-oracle-6.1.30.ebuild 1065 BLAKE2B 6728457bdc028b46b989d9d22f557fe7c026f6c2e89628defd10f98552f998e3a3952a5c4f0b259189d9b06cd2a6784fc1552aa14b0661f1ee5567b4231c5ff7 SHA512 7d5e08213780896e7162775760270df178838cfc0bbee7b49449263c94ee0bb504e6bec413c2cff4f185f2ed0f7097112e55e795dbe5d5dc290790685d6e9ed5
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
index 707f5fe35fdf..15b8d6321f8e 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 RESTRICT="bindist mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index d8332ee3cd13..565860a48c12 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -10,6 +10,6 @@ DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bf
 DIST VirtualBox-6.1.30.tar.bz2 165769447 BLAKE2B e15a8370c7cd83b547012639c3361da1b2ee40e8b094f11c22fadb95c9ddaae4791ee7cab16cb2eb23c6da4fc383f89f629335d577fa834fa1a979e19b9701bb SHA512 fab5b8327d9ad4186e584e90d1aca461d95731d0935509301e8adfe28d0737fb3ded5ac1d97e4cd1edc12c79bebb75cc675289762f9e918106f34bf6e8d363d4
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-guest-additions-6.1.24.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3
-EBUILD virtualbox-guest-additions-6.1.28.ebuild 6202 BLAKE2B 641664ed30c93f0e23ee6dd992b1851f19c9731a319f92623da31dfd6470ff168a369dc176f497a1a91346beda9e11037e7ea921d67b18f87e52f7949f563d82 SHA512 db330f5dec72d25937e4d3d014e6d8999b460d9241d71ef1a99f32389864b2bc0dad408bde877d7a0848150e4ed8be41469681ea27dda57f3d38f5bb38670f10
+EBUILD virtualbox-guest-additions-6.1.28.ebuild 6201 BLAKE2B cd41ee57b5c318c91448f424ac290f04c21b6f517b665d4c049b56aa2a3749217add2b7833a3ecdab0d0f422f88e73faafd73b4e317ed0fa14cfa9b6cdafa335 SHA512 55adb527616dd28904ef4b96c4c09254616a9fb57f3251a769f74fd1bd8b8a1c1c4b47a83a35e638923a3177db0de6a11ce3c2743a3c9899ee7defa2fa80fd90
 EBUILD virtualbox-guest-additions-6.1.30.ebuild 6202 BLAKE2B 641664ed30c93f0e23ee6dd992b1851f19c9731a319f92623da31dfd6470ff168a369dc176f497a1a91346beda9e11037e7ea921d67b18f87e52f7949f563d82 SHA512 db330f5dec72d25937e4d3d014e6d8999b460d9241d71ef1a99f32389864b2bc0dad408bde877d7a0848150e4ed8be41469681ea27dda57f3d38f5bb38670f10
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
index 50023a853b94..b2ce6a943563 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 7531c51f651d..086d887b61fb 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -6,6 +6,6 @@ DIST vbox-kernel-module-src-6.1.24.tar.xz 674584 BLAKE2B 3a20f615426a7b788bc4bce
 DIST vbox-kernel-module-src-6.1.28.tar.xz 674924 BLAKE2B 4a262a1609df493df8ba5b78d2daa225aed41fe51d54648633393dcb24ec648ae95f2fcb003f9a7ceb1a2a2ea99bc113d54db6621523ddfc3819e729c46f42c8 SHA512 b0fc1a1a821c93aa7dadd3a064d87938d31cf6ce37ab55d960fba104df4f28ab48797dc254e246af7bf1d5df913a9f329035941555fc9f165f02abea4448f684
 DIST vbox-kernel-module-src-6.1.30.tar.xz 675180 BLAKE2B 7df02a4b94dd30d211538cffe7e08aa590f78fea79add4105ecaa2e6d0ac2b495d950bab4950f301100b189a58dd29d1fd42c97c12e4458a5953cb5a2ed7c44e SHA512 19f080bea53bc11eeb67bb894fdce3ee6cfc0e9bcd0e697baad86b4f49ac331b0dfcca9b043def8ef8a9d40d3b867f09e14ffafb4eef47418184cbfd0e9acc03
 EBUILD virtualbox-modules-6.1.24.ebuild 1433 BLAKE2B c37f4ebb63aed96ba78b0135688f576a703fd2dcf2b677c64ead9b89dd1b0c4e40bff9076f433034c1330739c295c015a61e949118410c0c59ec609155d8f535 SHA512 31ab9638f1a2c89b9abf6cab996a345ffd9b72a57ed95046cea436aea25e12709018f1d3504cb4b0d1254a4ec8f2756612c682d5d84b2630dff9301bec24ef90
-EBUILD virtualbox-modules-6.1.28.ebuild 1429 BLAKE2B 1faa947e406ad79161cd598d495989dfa82fe9a59d8668f6cf25ded538623180e7e67535698948dcc54e9e007531695e3dffd5ee8345104284ea7dae784d6161 SHA512 456a3f1c5fb2319059c9e60ee9dc4b26eed0c82839dabd3668ac3954d9d1545a757d10e49aaa93dfb8219619a9b61a8314d8ae089c87bc0e4d7dec565d144ec9
+EBUILD virtualbox-modules-6.1.28.ebuild 1428 BLAKE2B 48089df7c194c139d8a655bf780c57db1b456a59fe51e3bd47b6d356d118ea00425f621e5a3d68a5f00bce850020f155a33afcfb2b7d662a6bb62ad6736f658e SHA512 93af76762acad86863a0e097695123f0ee04d44a1485d9b1ab334920aa748f14d64fcf8cd221ca68a2d546600000c18b168d47acc739efbaa878746fcdb53cb4
 EBUILD virtualbox-modules-6.1.30.ebuild 1431 BLAKE2B 3c716f116f8a09b77c2d4ac77ea5c7874a0a4acf7838ad8f7f9e52077cf5f2268495405f2989d20e8241c34ecbc3e00fc30b783ead07d31d05e67a09727e777e SHA512 7441895b632c9e33a872db3df031c358a58f03503d5f867e58d7bbae3f3a7f4655fad995e57f9003a9b0dafee04d0b267857437b3b0931eef5a521e13404443f
 MISC metadata.xml 353 BLAKE2B c6ea2895b404cd2f054212c19ca957db4a6786eab728721b51141798890b6b8ab27380befc334de9a9b4b4ddcc42926bb2d45da4bfd81e364d79cade7d58a42f SHA512 73cb5cca92831d8c26a10a73a4eb6a6b2a050e2ee68675b1e781ee6dfb96baf0bcf8031ed646883fcbbf88d888c52c6aec2e52fd62f383e7e533386bce8d54f7
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
index 468a1ffeef51..b50fe2587f84 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="pax-kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d0d625413900..ea7ad21d2481 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,6 +13,6 @@ DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bf
 DIST VirtualBox-6.1.30.tar.bz2 165769447 BLAKE2B e15a8370c7cd83b547012639c3361da1b2ee40e8b094f11c22fadb95c9ddaae4791ee7cab16cb2eb23c6da4fc383f89f629335d577fa834fa1a979e19b9701bb SHA512 fab5b8327d9ad4186e584e90d1aca461d95731d0935509301e8adfe28d0737fb3ded5ac1d97e4cd1edc12c79bebb75cc675289762f9e918106f34bf6e8d363d4
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
 EBUILD virtualbox-6.1.24-r1.ebuild 14362 BLAKE2B 8ccb97fd50bb8546284e3bc578520c9cb543dba55075d2d314ede56afe13c50ad39e8ae32f826133826160b2f3eb4e14dc37c7f7082e6eb06cff6a45d2bac6ce SHA512 ea58fb337c6eacd8a8b0e6a92f6fd6fd9c76313699509499a8b6a30b8b9f76b6c05d6e83cd24e537fe513aef4e770b020d3d7c0c4d446eaaa96110c1cb14c1d5
-EBUILD virtualbox-6.1.28-r1.ebuild 14454 BLAKE2B cf38e96b204a4d440be61e4f878f55a349bdd44a6f0b007093122ffa5eab0ba0b9ea6b7c0d6234742115fe4b90ab9d79f1b7371ce01fac6430e069854ce2646c SHA512 a9e2fdc3ab2dbcf6f64d98597ee428c96f55c0115ccfd8fba134a11d3a686272cc22514d9da2ee44ba66868dd0dc59d03571b9bc4a9abbc9e970dd2143bb1723
+EBUILD virtualbox-6.1.28-r1.ebuild 14453 BLAKE2B 51d3b54117e11c0bdabd7ca67424a0accf5ad6bb623d8331a55e159bcbeaaac99661b9497c4d451acbc90a39f79c5804a26092c96af86dae593cb900a11bdc30 SHA512 b3d007f5f5da597f47775277d21ad97a643076456f633de834006f874338cabdbd291c10516dec6d2549c78672ba45737e54705ed7acd3a2dc70a7221d31706b
 EBUILD virtualbox-6.1.30.ebuild 14454 BLAKE2B cf38e96b204a4d440be61e4f878f55a349bdd44a6f0b007093122ffa5eab0ba0b9ea6b7c0d6234742115fe4b90ab9d79f1b7371ce01fac6430e069854ce2646c SHA512 a9e2fdc3ab2dbcf6f64d98597ee428c96f55c0115ccfd8fba134a11d3a686272cc22514d9da2ee44ba66868dd0dc59d03571b9bc4a9abbc9e970dd2143bb1723
 MISC metadata.xml 774 BLAKE2B 5052aaa17c815e63ef8cd450e09f220a71e8a59df1ab79ad7dd713780dd0c62ae5bc453012b35d8e37a7b0dc9b1287c3a8119f0324c4a5e8ba6211b20f5350e7 SHA512 2b0515ae0e5a280dc40b6ecdaaa9165f90b6e276e01323896509b9a2ecc01a34d4e2542788ba3166d56a242c8ed65ef1f2df6e2de62b95d11700d28036f616fa
diff --git a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
index 358382f4a8b7..0576c10043d7 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 COMMON_DEPEND="
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index c4c3e6c7d8e9..c4f6b7d4463c 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-vdr/Manifest b/app-eselect/eselect-vdr/Manifest
index 01d3c6f12a92..442533eef32c 100644
--- a/app-eselect/eselect-vdr/Manifest
+++ b/app-eselect/eselect-vdr/Manifest
@@ -1,5 +1,3 @@
-DIST eselect-vdr-0.0.3.tar.bz2 1899 BLAKE2B 837b1b2736b6ebf386f7a284a155d0d12509df97b4fc424926a1cdb0350358b5ba5cc73eea3069166c16f33c7707e54a6298b645f27e2f5a57f8879a5e349aed SHA512 6cd1c43271106d3dbe59c12148b0364c11a9767cb9ebb76e1647f707573d8fb875dfaa3ebd0b76523270e20c7ce4afd17d05dca0ef1dc4331366f49895498631
 DIST eselect-vdr-0.0.4.tar.bz2 1874 BLAKE2B 1f8f419b8e3468507ffefac7e2bd5c969a6e084500b77ff65a32a35be4eb76b9a1b988965c92a3c4cca22eda3a4553dda973b5a26645993b5198e859b732f698 SHA512 8c5aca0ce8fc1be04228e8e93b12438f1639d71e1b084f0bce1c3f730a3fb9aafa9429ffec21f3baf40c5759dadea2753e9af0b674230a407823203be7fb7656
-EBUILD eselect-vdr-0.0.3.ebuild 506 BLAKE2B c3270a5823ab915c6b587a15d90ce4a0614f1770564b304479f2c10cbe18d78618f04e9618592e38a80d072f0c0461f845e479a4562db5070b3675b938099b9b SHA512 c44960a78e7c35b18bd31f342b1332bdb5118b9f13e1ed717715a14c3ab98fafa6378227f502bf9e61991eae73e51e3b601f41d4f9585928a1bf986c82d71a73
 EBUILD eselect-vdr-0.0.4.ebuild 526 BLAKE2B e7028446a864ba2283ad7b61a85d92971504c00cbfd8fa80045a5a7e3ac9fcfc282bd0757e47ed807d95dfec8f2ea4a3b884e5e11e0865191332b911700c01e7 SHA512 c0e8802ce7bfc51bfd6042e40a2690ebd8f9543e68210592a2826a23ac213921d4e5ae824d2f817c5571442de6528319b75850105b7744b405c4652f2b983505
 MISC metadata.xml 274 BLAKE2B dbc56053538593fa099c0be13d07388c106eaa52bb3e23d9360d49d39ffaaf7d03fee7c555fb028918ec42b64e7bfd02e0aac2b727648b546b446c49bcc66ba9 SHA512 9058e6c5dbf628f01b383e99f03f1d735d18f9728f3e6cb53abc7bcb9f536db1b60ef7251f60a7081b88218fea25375304efdd35d23c1e9eda5010d9fcfd7f19
diff --git a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
deleted file mode 100644
index 74b2e7d0726e..000000000000
--- a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manages the VDR plugins"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/?h=eselect-module"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins vdr-plugin.eselect
-
-	dosym eselect /usr/bin/vdr-plugin-config
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 771189d541c7..a02c7e9ecafa 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
index 5070d942b89a..53e27b5818a1 100644
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-ru_5.03-2390-2390-20191017.tar.bz2 1725818 BLAKE2B 8ab0e5e6c0b7a0bda8e80e99202a9de38298a743ea7b356abb7f50840f222c5ef5397c96e490bfb1b37858fbaf50704e38cae7b2df5f81e0890efd7f73d3a909 SHA512 959ea5f206674b1bfbdac944a391a8d183b02d67ac26a9f33abb11637157cff6c60fd89f87669e2561eaa1c6c0bc2565deceb6f7e72e381d202a93773251fe7d
 EBUILD man-pages-ru-5.03.2390.2390.20191017-r1.ebuild 712 BLAKE2B 6b87735b3b954b27218a898a816c99dc41c6aa3ebc285367d103897456cd14aabacff6e75561596e611b344ca078b5cedee7a1fe0bd6cf5b0ff5afbac09285fc SHA512 97594886008275e3e6323e3401e4a47f65626bb004729b4cec5847a32272b2bfe78d6e804b7e961e952e6e30fdd6959fceb289e9423d746b5928a9b65e7efc47
-MISC metadata.xml 437 BLAKE2B 8be0069bdd22f58131591aca6136b751bb9fb403715bc53e397632f3cfa9b2038bb956f2478e0045363635148b56da857895daa553b37e7eb5a032add53bbcec SHA512 03455446c1804a260a5bbd11435c78f057013558424d42a88126cd2f59b920718bab41034ffe5a38c1eab52725803fb7e28f6ccc866996abf20653bc9581d5c0
+MISC metadata.xml 461 BLAKE2B 4956ac67d5729a8aa8657b33095ac63f9ed59de76db3175703667d36de844c05256c4a83f30d22c3da530680c5786cb681deea45e19ecba663929d8da5c5e837 SHA512 92b9738179c181aa40000f2f7daa28b12f7efab9e8476713cb6ba5e30a23bb21c846e4564f4f0eaa9dee141651927fca1c522da7477f2044dc588c653a5dd383
diff --git a/app-i18n/man-pages-ru/metadata.xml b/app-i18n/man-pages-ru/metadata.xml
index 41b7bcaf88a8..13f597b1bf7c 100644
--- a/app-i18n/man-pages-ru/metadata.xml
+++ b/app-i18n/man-pages-ru/metadata.xml
@@ -5,6 +5,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">man-pages-ru</remote-id>
 		<maintainer>
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index 40a3ee0dce5f..d0d407920048 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1,5 +1,5 @@
 DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
 DIST man-pages-zh_CN-1.6.3.6.tar.gz 1861327 BLAKE2B 59a806aadd0ab6584a51efec8cf8e0e3ff88f589db48dd01d586534f81a06cbdc86efc7541bd9ced778b8ecc915e0f1baded882951fb60138e197f7b6b259d60 SHA512 dc9ecd461eba41fc30658e028f853e3664fc6ce27c5b48c3159c5c8a452ad6d71730e0e5f551efa7b4c358baf010ba27a855457ae69b21e9637af326044dcca8
 EBUILD man-pages-zh_CN-1.6.3.2.ebuild 832 BLAKE2B f22d5af540573deec7a75e5390a75463190ac64b8406363415f35db9ebe9c60f1eb7608bd430cb3f394090a1172ae699a999222db9c87f5ab745f9485457c163 SHA512 4ccd643343fa74ebf7613fc94b0e8ad9555710c82c6a88b923489e7bfd1a1c92b9eb44fbe5933cd02f6ac626835ea1ee3676b85c76ddaae78735771fc26c8b98
-EBUILD man-pages-zh_CN-1.6.3.6.ebuild 864 BLAKE2B 81502c5a3af74ae38ffe07d8d9e349d1ea2145b944e95db55eb6534fc3330c50dd3143298760b5c656c8697b3f4545600bad9d6aab8d755a5ad75ac2219c59c5 SHA512 6ecea954f05aa5eed49e8d4218e96b2bb05171dd250b66658cab57746be7cca1d3e9506551b72a8b86635285fdc7e8d15f4cb8accc80d44beea18c8d0ebe3271
-MISC metadata.xml 486 BLAKE2B 86ba9e466c0f3aa1131645452f043be4cda3c2a39f24fad5e10c2baef357ec8afbff83b8f8cf76a11bbc50b91cc640c5a39ade4ba38f0b8fc752f43bebb45112 SHA512 2aac83400286feaf20fbcc38e53a346e49f1b8813228249589b161b782672069bf7c037e0c7806be0b277a09c111ac2b5fae31ac458efa2e3a93d7e61dcdbaa4
+EBUILD man-pages-zh_CN-1.6.3.6.ebuild 860 BLAKE2B dbfc9f0ceee421fa635782ef5d56cecf827138d01d94f15785b5c069000c70e6b91342cdcf8d772e3e2295609bbea58763c8ac8e67e420f3dd7c5091b574a0c0 SHA512 3f8a800e6f93ea1498546f018678832f4144ba45329bfa6a8eccc98fe3f8375f142af28df993e795dec92796bfa377446ae85270b8b52746b2d29586332e7c36
+MISC metadata.xml 510 BLAKE2B 3f43805f30ce2111cb64bce82fd146a28ef66116e4c83f19d8bfb09d8db7ad43baea10cd8d8a2ed9de29e73379716f44a4954cffa5d88cc5edf0e6f9dd10070a SHA512 511fe73db9050e1fc22ce1fce3bb0acfacabf19d452757f036dd915c556ed46814e89dbc2566ee3239c670c91651cb4ff760ceda253e65c2b4c751bd7c2326d4
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
index 6f75703a013d..d37d0427ad0c 100644
--- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="FDL-1.2"
 SLOT="0"
-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"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml
index 9e494569799e..c1d5fff9b9ab 100644
--- a/app-i18n/man-pages-zh_CN/metadata.xml
+++ b/app-i18n/man-pages-zh_CN/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">man-pages-zh/manpages-zh</remote-id>
 	</upstream>
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c9063b0e274f..085ed8315880 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index 5a28f9108bb2..a2a98cefd303 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,4 +1,4 @@
 DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b
-EBUILD beep-1.4.9-r1.ebuild 1038 BLAKE2B 6c1a0b4c58248af66065be5bda4e6a8787bbb9b5e12d9a5cbc5ff685f4f658a5a24bf198af1c172b21eaf100301977a0074735819c74c6d32d4f0ce97b60e9e9 SHA512 0e66feb9a409a63b97ad124bfc4c6ab2fa55ce2fea4db31f439bbccd44c8325c311272733edcf5dc0801a038e1f822d638ed127e15d6b10b5842320f5c3d3b72
+EBUILD beep-1.4.9-r1.ebuild 1036 BLAKE2B 8af1179f91ed10e068d03fe9d0e9eb7d8dc9529511522a28b62e54ec536d6da28d270df35e3ac6da5fc28afe3f4722663b64bd32e9cb4f3932dae3f69f48ef06 SHA512 cd8973c1d2a37052abb4990a8e194c5ea70dac5afd07814b7a54a689660c4d9510ea5ecaa2678d8a42ffface6823b1a9d6e6adc1800f1bb9576af65edebb872b
 EBUILD beep-1.4.9.ebuild 1044 BLAKE2B 2de3a51eb677557cc0012aad4573594c5bf0f86d489e95e1f32cfc73f2a33d18606e35158aa3af342833a768547d86a71f7c33a62ea3d98624b03ee57b7c2d57 SHA512 1a66a24c42965a2b2c80e4ba9698aa710d2beefc7bc40c3cae0933198a2a2f51a5b319c6f5fde1249dc47edc044332c2ae65409071640b1bdd84641c8c56f675
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/beep/beep-1.4.9-r1.ebuild b/app-misc/beep/beep-1.4.9-r1.ebuild
index ac1c8a15d646..e566132534ce 100644
--- a/app-misc/beep/beep-1.4.9-r1.ebuild
+++ b/app-misc/beep/beep-1.4.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spkr-beep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 
 # Tests require a speaker
 RESTRICT="test"
diff --git a/app-misc/rundeck-bin/Manifest b/app-misc/rundeck-bin/Manifest
deleted file mode 100644
index 91d94cef040a..000000000000
--- a/app-misc/rundeck-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rundeck-bin-2.6.8-profile.patch 1584 BLAKE2B e173e1b3688ac03e03c1c1c94285b7ca5aa1e1180d3d7adf5733df066bd9d898b5f0318c95e41704727519c7003d5183a75cd094393ff39a949fa09c3906dbda SHA512 f238ec1e7def87b214b5c1a940776705bcfe0f9d43d072a48a800f58ebbf77372b2b070ee18e43c0f2a2746a0155014cc5b41fb47fa967ab7499700489f4fd0f
-AUX rundeckd.initd 452 BLAKE2B 991239e09590f82b0b5f45c2f17700479f2e5fc8f0922bb255ee77cb64474c141d882a3f208ccbca8f81e1373238a06aa1105c47418078311e2224891b39ac01 SHA512 2c63e56f291a413c0328d036d8e8172112d1ce58a133f8b7e3a76aced774e0640e03b0b2f365870bec38faf753aa0c4090dc4813c1cde13a2a444d465476554c
-DIST rundeck-2.6.8-1.20.GA.noarch.rpm 101053077 BLAKE2B 44dc66ebbeb105e4ed5c198ca2cff9e69a03a226e43c0e68898a225955aaca471d1ada163962e25dbd3de097aa7582a3fae351d44a9740f1e46fc64526575620 SHA512 15620e306c10cae09eec95c43207cf88ebce69d4c7fd70289fac7f2f580343c623d77605f3dd5aa98cc882ec3512196aa431a2ff72e453780b415d19ee8bcebd
-DIST rundeck-config-2.6.8-1.20.GA.noarch.rpm 9460 BLAKE2B 97f943904ecfaa6d7a07bb7b8635ce13184f78fa3f042b5db8a4509d558836eda05772724e5fc58864a776900afeab790bbb6c86754e0f19dab12de827fda2a4 SHA512 ab4b9933bf942706cc1b8184375122d3e122e960761582d7b00b2a8981dc9b6cd6442ad8e65699db9e80e0a64b921f2916527f4c2263a58f70363e63a99b95d7
-EBUILD rundeck-bin-2.6.8.ebuild 1274 BLAKE2B 566193c6d33f18dc26499d421a79462351c95e183cbabc8201f71bb00f5340cec7a8c5f7838a5430d6a56c1b9cffd5540643214daa79376631791cab8a0e668e SHA512 8e8f96396a18f4958696c35dbc3614d626c2a611d635cac76bd3cb672a36db3eeffc5739983991cb94acc900654b372832ef80b00eb0548f71423fc4fb47d61a
-MISC metadata.xml 358 BLAKE2B ae5834e1df4586133cb14f64d4a664aad482c14d1daead2d84f74885c501e64fc67a63cb065b2eadefdc29cf86fc8690f9434b37cb7d41efe09baa2ae23a89dd SHA512 b710971ec9308e2511b0ef403dac067e885db8a4e5dd79a2b4bb0c8c1db7a688b969fc60493ed9bb1c0f531190cb4c1ea478a3d277dd3db20d942d68c9792fe0
diff --git a/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch b/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch
deleted file mode 100644
index a9ff4acd0a4a..000000000000
--- a/app-misc/rundeck-bin/files/rundeck-bin-2.6.8-profile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/etc/rundeck/profile	2016-06-10 21:37:22.000000000 +0100
-+++ b/etc/rundeck/profile	2016-06-14 00:02:11.630959252 +0100
-@@ -1,27 +1,11 @@
- RDECK_BASE=/var/lib/rundeck
- export RDECK_BASE
- 
--JAVA_CMD=java
- RUNDECK_TEMPDIR=/tmp/rundeck
- 
- RDECK_HTTP_PORT=4440
- RDECK_HTTPS_PORT=4443
- 
--#
--# If JAVA_HOME is set, then add it to home and set JAVA_CMD to use the version specified in that
--# path.  JAVA_HOME can be set in the rundeck profile.  Or set in this file.
--#JAVA_HOME=<path/to/JDK or JRE/install>
--
--if [ ! -z $JAVA_HOME ]; then
--	PATH=$PATH:$JAVA_HOME/bin
--	export PATH
--	JAVA_CMD=$JAVA_HOME/bin/java
--fi
--
--
--
--export CLI_CP=$(find /var/lib/rundeck/cli -name \*.jar -printf %p:)
--export BOOTSTRAP_CP=$(find /var/lib/rundeck/bootstrap -name \*.jar -printf %p:)
- export RDECK_JVM="-Djava.security.auth.login.config=/etc/rundeck/jaas-loginmodule.conf \
- 	-Dloginmodule.name=RDpropertyfilelogin \
- 	-Drdeck.config=/etc/rundeck \
-@@ -36,7 +20,7 @@
- #
- # Set min/max heap size
- #
--RDECK_JVM="$RDECK_JVM -Xmx1024m -Xms256m -XX:MaxPermSize=256m -server"
-+RDECK_JVM="$RDECK_JVM -Xmx1024m -Xms256m -server"
- #
- # SSL Configuration - Uncomment the following to enable.  Check SSL.properties for details.
- #
-@@ -44,15 +28,4 @@
- 
- export RDECK_SSL_OPTS="-Djavax.net.ssl.trustStore=/etc/rundeck/ssl/truststore -Djavax.net.ssl.trustStoreType=jks -Djava.protocol.handler.pkgs=com.sun.net.ssl.internal.www.protocol"
- 
--if test -t 0 -a -z "$RUNDECK_CLI_TERSE"
--then
--  RUNDECK_CLI_TERSE=true
--  export RUNDECK_CLI_TERSE
--fi
--
--if test -n "$JRE_HOME"
--then
--   unset JRE_HOME
--fi
--
- umask 002
diff --git a/app-misc/rundeck-bin/files/rundeckd.initd b/app-misc/rundeck-bin/files/rundeckd.initd
deleted file mode 100644
index f9afeb656479..000000000000
--- a/app-misc/rundeck-bin/files/rundeckd.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/rundeckd
-pidfile=/var/run/rundeckd.pid
-command_background=yes
-extra_started_commands=reload
-servicelog=/var/log/rundeck/service.log
-start_stop_daemon_args="-1 ${servicelog} -2 ${servicelog} -u rundeck -g rundeck"
-
-reload() {
-	ebegin "Reloading $RC_SVCNAME"
-	start-stop-daemon -p ${pidfile} -s HUP
-	eend $?
-}
diff --git a/app-misc/rundeck-bin/metadata.xml b/app-misc/rundeck-bin/metadata.xml
deleted file mode 100644
index c53c3f73d6b3..000000000000
--- a/app-misc/rundeck-bin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Gentoo Java team</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
deleted file mode 100644
index 7c0b4f11d35f..000000000000
--- a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch java-pkg-2 rpm user
-
-DESCRIPTION="Job Scheduler and Runbook Automation"
-HOMEPAGE="http://www.rundeck.org"
-SRC_URI="http://download.rundeck.org/rpm/rundeck-${PV}-1.20.GA.noarch.rpm
-	http://download.rundeck.org/rpm/rundeck-config-${PV}-1.20.GA.noarch.rpm"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-profile.patch
-}
-
-pkg_setup() {
-	enewgroup rundeck
-	enewuser rundeck -1 /bin/bash /var/lib/rundeck rundeck
-}
-
-src_install() {
-	insinto /etc
-	doins -r etc/rundeck
-	insinto /var/lib
-	doins -r var/lib/rundeck
-	dodir /var/log/rundeck
-	dodir /var/rundeck/projects
-	fowners -R rundeck:rundeck /var/lib/rundeck /var/log/rundeck
-	fowners -R rundeck:rundeck /var/rundeck
-
-	newinitd "${FILESDIR}"/rundeckd.initd rundeckd
-	echo . \"${EPREFIX}\"/etc/rundeck/profile > "${T}"/launcher-pre.sh
-
-	java-pkg_regjar "${ED}"/var/lib/rundeck/bootstrap/*.jar
-	java-pkg_dolauncher rundeckd \
-						-pre "${T}"/launcher-pre.sh \
-						--main com.dtolabs.rundeck.RunServer \
-						--java_args "\${RDECK_JVM}" \
-						--pkg_args "${EPREFIX}/var/lib/rundeck \${RDECK_HTTP_PORT}"
-}
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 53bbc73e9cb3..5e8b6a835f59 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -4,5 +4,5 @@ DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2d
 DIST wcd-6.0.3.tar.gz 813763 BLAKE2B 2e215c427914705213590d7c5182bebf39becbf24238bd71c5fdd12f7e63894b2ad571793f6d25833edd3f7cd4f3acbb07bbc821880c22d7a5d4f373cd972055 SHA512 b48a6f8a196725b4b570701813cf8a96e13e4fd6289b6c779218acc20ea1ea841e5f8648f717bb389976b715b95856e91bad3ffb20f8d80961d75eae8eacfbe8
 EBUILD wcd-6.0.2-r1.ebuild 959 BLAKE2B fb3fe319a16e334881869ff64f8c210051d821d4a035d4edbb214eba59322f5d97319774d806759086c37c2dd3d47029a3c24dd85758c556bef62fd3dbef684f SHA512 306a4990f8954e8948a91260469e020218a967ec9f105cf9f3c71f0f332bf49d17488e12363af0380d9d92864199a0ab3e6e4d9ced168c3b240707fff2339b2b
 EBUILD wcd-6.0.3-r1.ebuild 970 BLAKE2B cb6e237239514df241901fb64c4356c49a133049c4e3d2a942c3763ef659ab4b9a487328a27f5a1f2c22412a3ac765833f705def6ce903c2f9f1474a6f0b1057 SHA512 91ab6df161e9bf36750452d8e9fd0d45660e6e64aa583fbafc2ea0184eebe9b6f80e3bb56da597a7e5b3b857df01b1fd996e03f1b32ac3958444461b56714e0e
-EBUILD wcd-6.0.3-r2.ebuild 1018 BLAKE2B 40f6a4a08df8d4c10da5ae958154f483a68f78bb176602bd4a4ac9c8297316e39d6b8b0ca710443c810f36ad61e4ec4b94b84e173318b5e81ef71a1bfe96ad10 SHA512 6d03104b5daf10249d7cb01cd7b84d3bfa458046a9ce33ae43c412c0022a5d06fab4d1e0d92eb3a3825e00cd8bf409c20470b293d3644bb76aefa47e3724d9ae
+EBUILD wcd-6.0.3-r2.ebuild 1016 BLAKE2B 643575b1e0a3593f40eae46ad2bbd1572658202dd0785d79e81c1c09fbbcd3f438fba3ae70c4067a7f167bc6f3df69e8687aac1e9485c0337bab5dbbb21b94e8 SHA512 829499dc8ac746423f0a959d498b5ab7a453bca5b792932c9ec4999b2e4eab393c9d5c583a75aa583a03fceafaae5897ad15f54ecae6f45a357996b7ad57482e
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/app-misc/wcd/wcd-6.0.3-r2.ebuild b/app-misc/wcd/wcd-6.0.3-r2.ebuild
index 4aa21a201efe..49160e18f56e 100644
--- a/app-misc/wcd/wcd-6.0.3-r2.ebuild
+++ b/app-misc/wcd/wcd-6.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE="nls unicode"
 
 CDEPEND="
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7e93352bc857..3339cc7b98db 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index ba4eebc067a7..de02e66bcf51 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -10,7 +10,7 @@ EBUILD texstudio-3.1.1-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e
 EBUILD texstudio-3.1.2-r1.ebuild 1741 BLAKE2B 7fec25e47073dd6943faf080e207c83c5e4c37cf491fd7e43a4996bab28e025520f2a448e3b1125c5ce77af1ca9f8939b2ca2aff6842de199c42bd5ab93526a0 SHA512 0ca6c81335acbf0eda33c201569c39b475e4e75a585aa2e5fd0949ce2fd9378767e0e61a06735d63c3e185e4e28b6a4786ff207a5985428791180450e57a32f6
 EBUILD texstudio-4.0.0-r1.ebuild 1723 BLAKE2B 74614a553436ae07150a474ac73e2bec598b9d7b83179858f6b2c432bd1b960efa5aa9d02b6bee2f821eae0f3ee7335a3c0549750bd929c816b5b5d92216fcb1 SHA512 72e0e969688680647b1538efbbc28f53519886a5d54a3cd2c7e1081e01855de904d70b7a1e1c475d7b459bfaffd703572dd7aad11f3f44bc366344699639e19a
 EBUILD texstudio-4.0.1.ebuild 1723 BLAKE2B 74614a553436ae07150a474ac73e2bec598b9d7b83179858f6b2c432bd1b960efa5aa9d02b6bee2f821eae0f3ee7335a3c0549750bd929c816b5b5d92216fcb1 SHA512 72e0e969688680647b1538efbbc28f53519886a5d54a3cd2c7e1081e01855de904d70b7a1e1c475d7b459bfaffd703572dd7aad11f3f44bc366344699639e19a
-EBUILD texstudio-4.0.2.ebuild 1722 BLAKE2B f691f31d38d8a4461401d356d33a6e2909ada10e62a9a2bba36c5f68e9946d48588ec046015bfe0f88506ec2a100f50fcdd3007008a1d5e88d7ccf32e16d1108 SHA512 24812a08e13bdffe36bd6e486d847f632df25b89cefbd53c6e0b19284b679112eab66c7c204bd5f98905545ee7b1d17459b1074fb2cb4640ea28c47c69c984be
+EBUILD texstudio-4.0.2.ebuild 1721 BLAKE2B 99ca4fab9bfa132aa0b40ddc56ac8629f3e89d2479e0e9cc6b9a2d6df31c214f02ef40b62b95722005b6cd321f1c58fa27459e2675b990e6ee5630d35cb04639 SHA512 09e380741881e0e6a7ec6ae2c97236bcda625a66577c4ff448e9dcc11a954053452789251747d35dafcaf8dd801363a442a32292c770dfbc24b4dd77865e95dd
 EBUILD texstudio-4.0.4.ebuild 1738 BLAKE2B b8ca60e4d518b455550ea678db98711ae0cc5a77854f640b426c81f837442d7c476ea201cac301109777f4ca2d8d5d5a0f1238414022e7bce398157c573456ac SHA512 d74b3da403e6a8ccccf24e02abd5ada314ea6fdbf4f989cd3b1bc617a75dfc436362e582c89b43ffff1f254c135b6a8084ff09b35c4b1aedc2684638e851dc5a
 EBUILD texstudio-4.1.1.ebuild 1738 BLAKE2B b8ca60e4d518b455550ea678db98711ae0cc5a77854f640b426c81f837442d7c476ea201cac301109777f4ca2d8d5d5a0f1238414022e7bce398157c573456ac SHA512 d74b3da403e6a8ccccf24e02abd5ada314ea6fdbf4f989cd3b1bc617a75dfc436362e582c89b43ffff1f254c135b6a8084ff09b35c4b1aedc2684638e851dc5a
 EBUILD texstudio-9999.ebuild 1661 BLAKE2B 7ab31d156cb4b4a192ebbd96628f4f427ffe8f2f05296292bd3c98590c73110d5022e929df11f009188c347e108d5d460498ce44e243cfd91e49f9d8b2e7a405 SHA512 293d1621312fc9c5fb580a868bd67a43434c671b3b623048e9b93e6093d292e3975b292c1a7f6014853e44f803b0253a87a716ee30fa68bfec251f6dead07780
diff --git a/app-office/texstudio/texstudio-4.0.2.ebuild b/app-office/texstudio/texstudio-4.0.2.ebuild
index cfc862c1f2df..b2f02533f030 100644
--- a/app-office/texstudio/texstudio-4.0.2.ebuild
+++ b/app-office/texstudio/texstudio-4.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="video"
 
 DEPEND="
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 115fa9cb6e8a..4665af1d4f3f 100644
Binary files a/app-officeext/Manifest.gz and b/app-officeext/Manifest.gz differ
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 4b97942ab7c6..7d17538cbaac 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,7 +1,5 @@
-DIST OOoFBTools-2.56.zip 5256051 BLAKE2B ed78dffff2a2480d2c882c56ed7918d729c794227e909c7e6a115bc8632020b2c33ec9da0f619350b2eacf6ff604f727af9f50b435cd80f2fe952b440ff5f388 SHA512 12bb763a7eadb1aa03d9ed09b5b9754ef4465dba588b79f2399a48709ef408dddbd49ff470c872fe4e41f3da3faadb12eb5a37b31afc1f0f07a0b810110aad99
 DIST OOoFBTools-2.57.zip 5362083 BLAKE2B 81d361839cc5f3282d7d31465561230cdc2965c69cdc9ad3db5d6293a1ec76cb0bf1ec6fc8af706d6c5870beca3fb15fe091583eda127d1de26dd1d71c8e7b7f SHA512 f6cf01b173885eb30d1166753a3ffd357a23db71b517e84713783cbea7b36deb98d586faa0a555d6d7fb21b46e89ee78860407aa28fb7bb1e272a51df570ea50
 DIST OOoFBTools-3.0.zip 5371699 BLAKE2B 1288a6915aeaad89b7fdc07b584b02bc7387edfe14d0fd51c30c7c8b061ab4967f7e16ea407f8be658739c64ce266a24f1404cbdf88d7d0d479bacf4bb9bdcf7 SHA512 af257febd4a2c2361586567e5d48205d31f517a7142a6da358ef4e0261c27d19cfb594417c06fce73811ae8e4e69812bec00d4ed8a0acd6881011f46d4dfadab
-EBUILD ooofbtools-2.56.ebuild 774 BLAKE2B 0830f01c76bfb71060d55031aeb1afc93882492c561e1c66335ab05e6d7997f336990e02893d45dfdffa5b2fc058c8ec6f98ee8ab8bfb5eb4beed42adf9b672c SHA512 87ef15f888f3781e057cc9977cce71f7645668bc470fbddf1f770d39f1b615cf131125ba4e0773af9d8f550425f5036b2990090017cda04e0f1e43d0772d5d7b
 EBUILD ooofbtools-2.57.ebuild 774 BLAKE2B 0830f01c76bfb71060d55031aeb1afc93882492c561e1c66335ab05e6d7997f336990e02893d45dfdffa5b2fc058c8ec6f98ee8ab8bfb5eb4beed42adf9b672c SHA512 87ef15f888f3781e057cc9977cce71f7645668bc470fbddf1f770d39f1b615cf131125ba4e0773af9d8f550425f5036b2990090017cda04e0f1e43d0772d5d7b
 EBUILD ooofbtools-3.0.ebuild 776 BLAKE2B db53b60ba2d911388317f0d1c8850f90be186e5881118f779f3fc4b15b02530ce45e9fe81750b10977f5585bd5cfad97f2a463e13975746937928f063d20523f SHA512 ad0db8a80619ee5e0dd4951aae5714fbd764880b706b8e5f4fca497f326541d965937501f7ee08054f5f03e4f14352fdc25bd0b47df488637d3fb27c4f1776cd
 MISC metadata.xml 589 BLAKE2B 5508984c093c7b7eeb1693b180ae42a9ffc25b66a4f0cf90d8bc563db39ada4645a6e03085d619a01f70915de97329a5c9b0ee2fc60b3b895836fe127d3d5df3 SHA512 c8404f2a5c7b8d3f503120c646042bb2578c67f5706a9f02ff42d74132b3145a01e816e85c37457623c08716d515d5cefee58f9bedf4a5d1c86a1d1aba9012b3
diff --git a/app-officeext/ooofbtools/ooofbtools-2.56.ebuild b/app-officeext/ooofbtools/ooofbtools-2.56.ebuild
deleted file mode 100644
index ba19afd21c64..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.56.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OOoFBTools"
-OFFICE_EXTENSIONS=( "${MY_PN}.oxt" )
-inherit office-ext-r1
-
-DESCRIPTION="Open/LibreOffice extension for the FictionBook2 format with validation"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/zip
-	dev-libs/libxml2
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
-	default
-
-	# Remove Windows cruft
-	pushd "${WORKDIR}/${MY_PN}.oxt" &>/dev/null || die
-	rm -r win32 || die
-	popd &>/dev/null || die
-}
-
-src_install() {
-	office-ext-r1_src_install
-	dodoc ChangeLog*
-}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 4569e959f6c6..8b577d9be12f 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/gnupod/Manifest b/app-pda/gnupod/Manifest
deleted file mode 100644
index 499fc10448bf..000000000000
--- a/app-pda/gnupod/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnupod-0.99.8.tgz 207572 BLAKE2B a3f87ed0f3d66d83fb3aec5ebee3d490f01488e51627b57956c27fba7bac89c37cd2c38ec15d11f354f3af6eb2f72e73b918540737cc5d5723c32a001a0b765e SHA512 ac9ceadff371e052b6deb4067aa73e190ad109feb3337cc205d521fbab11b5bc1415e44907761711eeaaf7fcea6a1a841c08e2177fa912446cfe7495d2a5182b
-EBUILD gnupod-0.99.8-r2.ebuild 1201 BLAKE2B a9eeb8116bdcbef738cd4ffe45fc0ffa5a1302c868665f927b2f8f8445ec38d174b599d46d62f45a753dbe28351759a84d172f726eae8c398848c05318017af6 SHA512 2fd3a9fd9012b759d8fee962f4df9d95cbf9147d5630c9c5d153b9bc87d240a913a57de03bb383ae47a19d10d0e882d3596af5e81730f487f0a44fafb6b2fe42
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-pda/gnupod/gnupod-0.99.8-r2.ebuild b/app-pda/gnupod/gnupod-0.99.8-r2.ebuild
deleted file mode 100644
index 69c256e6492f..000000000000
--- a/app-pda/gnupod/gnupod-0.99.8-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A collection of Perl-scripts for iPod"
-HOMEPAGE="https://www.gnu.org/software/gnupod/"
-SRC_URI="http://blinkenlights.ch/gnupod-dist/stable/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="aac ffmpeg flac mp3 ogg"
-
-RDEPEND="dev-perl/TimeDate
-	dev-perl/XML-Parser
-	>=dev-perl/MP3-Info-1.01
-	dev-perl/Unicode-String
-	dev-perl/Digest-SHA1
-	dev-perl/libwww-perl
-	ffmpeg?	( media-video/ffmpeg )
-	flac? (
-		dev-perl/Audio-FLAC-Header
-		media-libs/flac
-		aac? ( >=media-libs/faac-1.24 )
-		mp3? ( media-sound/lame )
-		!aac? ( media-sound/lame )
-	)
-	ogg? (
-		dev-perl/Ogg-Vorbis-Header-PurePerl
-		media-sound/vorbis-tools
-		aac? ( >=media-libs/faac-1.24 )
-		mp3? ( media-sound/lame )
-		!aac? ( media-sound/lame )
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	perl_set_version
-	sed -i -e "s:\$INC\[0\]/\$modi:${VENDOR_ARCH}/\$modi:g" \
-		tools/gnupod_install.pl || die
-
-	emake DESTDIR="${D}" install
-
-	dodoc CHANGES README* doc/gnupodrc.example doc/gnutunesdb.example
-	dohtml doc/gnupod.html
-}
diff --git a/app-pda/gnupod/metadata.xml b/app-pda/gnupod/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/app-pda/gnupod/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 880267e8010f..e84417002d3c 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 98d91b5db000..e479a4dee1b9 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -2,5 +2,5 @@ AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f651
 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20
 DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf
 EBUILD dash-0.5.11.3-r1.ebuild 1801 BLAKE2B cf92bfded4c564d16dae5376b19de7aff3a863900a6abe04a7fb400c1da218f029a96f0a44e3547516487830b028e6aeb4d2f656e9d1ca6d896f112eecb6f085 SHA512 71833388e04cdf9c31eb8596a5fdac9d4a772cdb502f23f878c8e036863a093f2617f5500fcee01984f0e09d14cc2a4cf39a326bb3b0d94ea6ea8f8015c53e69
-EBUILD dash-0.5.11.5.ebuild 1810 BLAKE2B 5656dbe6e95a26b1a02f1462fae1e9ae800b4325c12ee6ddb5a46b37dd1f33ed78c8c6730f9413b00449a1797293cff12e0c2b5cf1f4720b7204631602721db4 SHA512 e1ed1b2ec5874e05d977ff1b79d00048a86290a886d1451c76667933dea1651baebfdea7d5010e78cdb60a05a95dfad9c00cd3dae04ec2a671a5438a7cf4c9e2
+EBUILD dash-0.5.11.5.ebuild 1809 BLAKE2B 20fc89edae1d3542f10399f89d76aa5a269b2474a975a406fee019409d4a9009892edd94da7b7bebbf4909bb0e31bda6a967662221a8386869fa0a0abad6be97 SHA512 076ee88e8d388974bebc41c98399910c0b36eaf2b111070162cdb87f090b157c512bb4d3917919bb2d3e361b04a9cde27fd4bf347af0f48dd06a9b5e36bea201
 MISC metadata.xml 491 BLAKE2B 3d08132186e59ebe99a373e66213bfbba27182568e7eecbf508746d0906f980e3ebfdf216435a92b5493c13d40046dae037792258386d37f3eebcaa153fb3bf3 SHA512 8b441641d69c13cc5aeb93ad447c387b85d4b1958b67673df6ac5867073e4f204e6e06e35f3b92083266539bf3a0b1ee568aa2aa502ff8b27b9e54bed18b4d84
diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild
index 72a337fee44a..a69f1942bf62 100644
--- a/app-shells/dash/dash-0.5.11.5.ebuild
+++ b/app-shells/dash/dash-0.5.11.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit static"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
index cd21cac1bff2..7e245481115b 100644
--- a/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+++ b/app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.shlomifish.org/open-source/projects/docmake/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 
 RDEPEND="dev-perl/Class-XSAccessor
 	virtual/perl-Getopt-Long
diff --git a/app-text/App-XML-DocBook-Builder/Manifest b/app-text/App-XML-DocBook-Builder/Manifest
index 84da87c34b97..b54999d722cb 100644
--- a/app-text/App-XML-DocBook-Builder/Manifest
+++ b/app-text/App-XML-DocBook-Builder/Manifest
@@ -1,3 +1,3 @@
 DIST App-XML-DocBook-Builder-0.1003.tar.gz 18414 BLAKE2B d9a9442c46e171fdd8cd11cb997b8f1dd6ddd92c1ca03f0430be01828c0b46439a3aa14f6d68c2550f21bdee17871a8b314c2f1712b7810344d3a8385e9fea8d SHA512 421fdb84c2d9373ccdefa6b490bba1a78660414d27f470fbad48ac48178e3cb383345cd63a232bcf4ce13561e6775ff97397f5ab06c6142e1d8da34a92d6dcbb
-EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 576 BLAKE2B a491f06ce5bb7683e0a31b17785fb1044104e6e648fb67252d2ee207203e154863a99a020689be132d72f2e56f6e17519571666695b1f7c05fb31856f85b298d SHA512 f5aaaea7a5328e8b42288a4560c370001b2ff38b9df9e6f594b1493c5f9e633bac018c7358a6feb14058c2ee0e1dd89a8a28b61655d275405b47e080c30a7f59
+EBUILD App-XML-DocBook-Builder-0.100.300-r1.ebuild 582 BLAKE2B 7e174eb68acd82d36e1cc4cc9bfe646e19c74d864bb95174fcce310b3185ada68a53103f703cdf3439875a7e0ba12ab7bc75fcb22007d3185ed7afa62cfa23fe SHA512 74ca5c7e211a33eb35e7a4ba08bc55621d068ee318d78f9a53dccbc59ab9e8757c1189a01447cff56e9c0df4e9b987169de085abc99f466d986af607fcf5942f
 MISC metadata.xml 375 BLAKE2B 7b6956381a455fffbe920a0706a91819fd70eac409a10a32c7c609a85dfef6bf97a64d2781dcac0bb624fa64be2b56b8f1e2f2dc9d42b728c019e514839f6492 SHA512 dd707b431ec91e6cb9da5dc0e2b21937739e480d0e3f2fb42f8236d7f9c1bbe1f8e2f3d95b506c49c3a982b4769eb441eb306310b82cb425a4550b51728f6a1c
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 392b8a1bac60..94192a125dbc 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index afb53cc4d9dc..b3e06c9a8dd9 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -3,5 +3,5 @@ DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da9
 DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008
 EBUILD dvisvgm-2.10.1-r1.ebuild 1166 BLAKE2B 26e6a705af966e996d370e139cfcc1e4568b5d2473923ae9d5ccd938703e832c32170779536ca893fb19f066feb931620cedca2a85ad24e809264e50cec98693 SHA512 0820393c43f6358e1e851ade6b2e33d14dec9b35e42566f39d6aeb0b4001db6609f626c2456c02b9a8a1fc300c3641010b28432de4fdbb3a1c79eda93651009f
 EBUILD dvisvgm-2.11-r1.ebuild 1174 BLAKE2B e4993aa5e154933dce24b7da16fa968e36922b58659f23199391b1b04933ec1cfab75d265cc0479b9fd2203ecdd4037131b7989b87971739ab347b18d15c35c3 SHA512 82b42b4d29502975215e88eba5067087db20fa7c9d301d438b634acc242f82bb35f0d90b607117508302212306bfd4a599aaf3cbf6656421d98176fbee50aaf1
-EBUILD dvisvgm-2.12.ebuild 1138 BLAKE2B 944616ffb6a7cd7e02b450b0e5093a4ae6bed9558a3a67221bdfd8809b91426069dfb9741803275d2410154d092a37ee4e18fa8424aa7a5535ce3230b3be617b SHA512 927358cd7e1f339fd0377681f6d78049b9b984a2f30ea332ddd68eacd5fabd55da8dd20bab33229bfd60af39da352d776d3d0803c743a86ac9d27d7326e0c6fc
+EBUILD dvisvgm-2.12.ebuild 1134 BLAKE2B 62fbe3220b3c3af58ab36c70c1e070605a47483c216488de23ff83d52c79d5313ea236673bffbbafa443801e214286218ff585018b5bc3c4460e98074ff15148 SHA512 a5a937dc42dfc9b6b23c60a1fc094bed65cd57ee524a1791f0548d865c371ac5c0d1d144187994f03c20f5dfe7cb4994a5917176dfbfac41e2a24f529f69a009
 MISC metadata.xml 383 BLAKE2B d4d13b1caf7ebbd81baf9d911434c0ca57f5b9c5d5c136c0ae569341c511e61fbbaf9211accff192d86bdcedca81ad9f6dab2e23f65778a0b2b7c4be0a286a1e SHA512 563b8459b11497c84145cd7dca5cfa38cafbd5bbeb2c2709080633e785509073b96d1ee999fa87b4263f2babefe32b030361fb537b9016cc3eb5ccf423639573
diff --git a/app-text/dvisvgm/dvisvgm-2.12.ebuild b/app-text/dvisvgm/dvisvgm-2.12.ebuild
index 8544ed0a38c4..39a5bfb89049 100644
--- a/app-text/dvisvgm/dvisvgm-2.12.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 # Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 38063fca81c0..179978d75db1 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -15,5 +15,5 @@ EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
 EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5288 BLAKE2B 1f194c1941407cef1131e3e43e4ed01cc0faf1f66c41c94ebd7e1cb40ca99b52e132200bf0dc667e4a6bb32382764b59954fc711d7c6955075db5b9cdd8c81ff SHA512 d73961f100f711592e9a59b52ec27a5cba04cb1c53e09dd009a1f623a179e8fc44dc14ba5ed1d64a6240478eb034ef1865d7b7ed49e9c846e9cd992ce0aff109
 EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
-EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5096 BLAKE2B c992509ba4e2f127ee96f8020f7ea749dc1d4bbe88fd3434825030c646a259bf66dcc3695aeaaec227df71ea46bfbc760a6ea399465d8609c5da43ea7b9cd4f0 SHA512 1f2f40b3a4482b3eda5038ec9e263e266ddf0c25963b6f0e51f7582ccbf2c17b3e9037599f343ddad6d5e0f43386a4d5c6393f6447850539ccee04fd0282411b
+EBUILD ghostscript-gpl-9.55.0-r1.ebuild 5093 BLAKE2B c63b8900869ae5bf71667e40a9c33a501ee9c3e0440e98bef6fdd92551c1d27de4844e77ee82f283376edbf8d3863f5f11ef57e4d3456a2886ceb9dcd0826058 SHA512 abcb917467547f5ad10eb3da0ca8243a69cbcf19f4e9d02a054c1369f7d83b60d5db7a672d0179fd0a4768806c46b86ed58a9da380047f1b598e7345291474e4
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
index 4f3e1a6e0151..f2d7315d17be 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 6aedcd1499c3..3d549b2c3097 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 689 BLAKE2B 2f95b4642b49229b6dd509385819534bf80917f81b3136144dfd919d12c5a922d4b2a13837ddc6c5525a7b9ac70abd21c3a5d8951f8e0fa9dbbf03fe0207869c SHA512 be3313c7d72e318747b95fbf4f31c640a28827f7cbb49fe8764dc7dfc4b4f43a566e11e6fe0cff279c99c9351f0ad578fd553ba5f3aebdd4523cc0a31d80d002
+EBUILD libgepub-0.6.0.ebuild 688 BLAKE2B 6403a39233e409d7f3ac26d342e1d6439ff9771f585363b6b1906020818bce7be222bd12fa518bfae2d04c5d03c3950cf24fbd99e6a1353ab03620abc2cc7d80 SHA512 214a6a8b039c93213918e2a302415952c8adb3a8bd8d42938509fb31e0dc4945eef641ecb27ad22145a84102684b10ad7e5c2eebb791995911e9bd3131599106
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index a00d54d6d7f2..3dc7a2b3c588 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 51286e332da6..82a571ef9141 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -13,5 +13,5 @@ AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a7
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
 DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
 EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
-EBUILD mupdf-1.19.0.ebuild 4213 BLAKE2B 1b161dea60359b4c82e5638a4c4af0dc392805bebecce65484d32518efd27a6ae164c4495bcbf94684787cd27798407d72737d9a19ac4ffcdf0009adac46bcb1 SHA512 ebcb029809f7661ff2cd671cb11ab777e5e6eca2759ec7edb60ed35191f125b5c880fcd46fa5fcedb893fdf8e02bff70b592605a63f3351610063748db2dfd1f
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD mupdf-1.19.0.ebuild 4464 BLAKE2B 45d3165da6c42cf75673aac3c14e99ce4d54181c24bfd1524aab515c26bdb18eb1112b6a7e3fc54402346e3106918427c17e8f97599711f9830e6b4d86f1dc96 SHA512 c3b803db79087c1a0e302c414e97455ae3c6b16d1c454694aa7538ae66bac8627eaeb4b1bc9547fcabaeacd17bbdf6d307543a6f247ac15d3004b34563b9a59e
+MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 115e9d64a669..5d2f87cc3174 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.19.0.ebuild
index 88ff8063033b..9d1dae31213a 100644
--- a/app-text/mupdf/mupdf-1.19.0.ebuild
+++ b/app-text/mupdf/mupdf-1.19.0.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 		-e "1iAR = $(tc-getAR)" \
 		-e "1iverbose = yes" \
 		-e "1ibuild = debug" \
-		-i Makerules || die
+		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
 }
 
 _emake() {
@@ -122,14 +122,14 @@ src_install() {
 		domenu platform/debian/${PN}.desktop
 		doicon platform/debian/${PN}.xpm
 	else
-		rm docs/man/${PN}.1 || die
+		rm docs/man/${PN}.1 || die "Failed to remove man page in src_install()"
 	fi
 
 	sed -i \
 		-e "1iprefix = ${ED}/usr" \
 		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
 		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-		-i Makerules || die
+		-i Makerules || die "Failed adding liprefix, lilibdir and lidocdir to Makerules in src_install()"
 
 	_emake install
 
@@ -144,7 +144,7 @@ src_install() {
 	fi
 
 	# Respect libdir (bug #734898)
-	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die "Failed to sed pkgconfig file to respect libdir in src_install()"
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins platform/debian/${PN}.pc
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d1f54d61bd83..51963cb7f02f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,10 +1,7 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
-AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
-DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8
 DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a
-EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48
 EBUILD poppler-21.11.0.ebuild 3330 BLAKE2B 98babbca9cf633b92235569e7cd3d790fbbfb714be2ddce49e7f238d2eb234e4ae37a280e3a7d753f3e0b22a7480038dd87940f1a7bd6b3d731eafa5a1c2c756 SHA512 f6672b5a613f3933a83b702a1ace108eb62f644e5ce38b53e59ceadf602f815ae5c69bd536325d0cb668fc73fed7c767da48b6312caf3be03bef886d6db97f2a
 EBUILD poppler-9999.ebuild 3338 BLAKE2B e4d5451cffda510fe65615af575175011627ef6116e822c00e8d2ac6c5dd50177ec14709f64fecbdde55562ac77cf895160d8a6239e254a3e9ee0e63058184f0 SHA512 821eb6517298d9f5a10fdf1aef8c6072f00ce7f5757cd2b41d8bad927ee44c95bd2f5ef0a13efe18484764fcf883b27364e128611aa0f9601dfe1bc427411fbb
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
deleted file mode 100644
index 8781bbec5bbc..000000000000
--- a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
-From: Theo Anderson <telans@posteo.de>
-Date: Wed, 14 Apr 2021 10:16:11 +1200
-Subject: [PATCH] build: respect cflags
-
-Signed-off-by: Theo Anderson <telans@posteo.de>
----
- cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
- 1 file changed, 4 insertions(+), 73 deletions(-)
-
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index fe1182da..b77eaa3e 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- 
--if(CMAKE_COMPILER_IS_GNUCXX)
--  # set the default compile warnings
-   set(_warn "-Wall -Wextra -Wpedantic")
-   set(_warn "${_warn} -Wno-unused-parameter")
-   set(_warn "${_warn} -Wcast-align")
-   set(_warn "${_warn} -Wformat-security")
-   set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wlogical-op")
-   set(_warn "${_warn} -Wmissing-format-attribute")
-   set(_warn "${_warn} -Wnon-virtual-dtor")
-   set(_warn "${_warn} -Woverloaded-virtual")
-@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- 
-   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
-+  
-+if(CMAKE_COMPILER_IS_GNUCXX)
-   poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
-   if(GCC_HAS_AS_NEEDED)
-     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--  set(_warn "${_warn} -Wshadow")
--  set(_warn "${_warn} -Wweak-vtables")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
--  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--endif()
--
--if(CMAKE_C_COMPILER MATCHES "icc")
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
--- 
-2.31.1
-
diff --git a/app-text/poppler/poppler-21.07.0.ebuild b/app-text/poppler/poppler-21.07.0.ebuild
deleted file mode 100644
index ccde4b8643bb..000000000000
--- a/app-text/poppler/poppler-21.07.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/111"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index ddfd2ee22c23..ef098e18c731 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -2,5 +2,5 @@ AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed
 EBUILD t1utils-1.41-r2.ebuild 647 BLAKE2B af44e224f01fe627267a3b5a5054a4ea6cd22dd602a4d6091db1eac73da73ed8b911609b67a35e6469b7cdd7132ef56eda107a6254cc53f7bcfda22b2faed394 SHA512 49bbd7b7fc14ceb3583d3b4277d0e225a883b0873b69c159e709cea02236c6f5c82a2cb26668d2d92cd76a67ee98640ff3826c4686f1485f00e308cf26f6b4c0
-EBUILD t1utils-1.42.ebuild 547 BLAKE2B 7bcfc96ce838dd7622fb6b2d7afbe3ad9cffe29cba9e0cb85bf0e471e6339ddb65b91a0aac57517842690861ebcaddf5caf1cfabaf714cdb13a3a0abc2ee494f SHA512 d4a46baa60254c5e3a78c4e12e53445673a0fd46db7409f4a6f8f2b190959fdd1d11a9f798fe9bf380a8c5a88626c9dcc1b20967925e53c8583d884f879a9aac
+EBUILD t1utils-1.42.ebuild 542 BLAKE2B 78c6a5a00b3b177744434ba10111082b46ebd8e136a89d9ddd56a888a9f9d586180ba7fc316cab810c21036755663072d482cd7ae789b263ece81873b6bd73cf SHA512 2de00f97e597e2c1aa7bb89db448381d5155b178c01dd781e60db94bb6da88e3b66573c1e76b37745b04d615f63b082d9b2d0b70bff8511928e17f6395a5c197
 MISC metadata.xml 348 BLAKE2B 6bfc533631d2566e3ee69cd2984da33fc89afe690b4501ed2a1e40b8f961fde4e9049f67a3a32de0cfb54fccae798f29c24f86c3d57854ddfa904bacc275d702 SHA512 b329f25a743f60cacddf37ab7ec8c22cc64a2bf06c02f3115e46a80974a761e456d8ded059e8a8ec09abcd8653a16e6fd81fcf2af7d11f3c479716d69f556fbc
diff --git a/app-text/t1utils/t1utils-1.42.ebuild b/app-text/t1utils/t1utils-1.42.ebuild
index 73f3454a81d8..ed755ef48db8 100644
--- a/app-text/t1utils/t1utils-1.42.ebuild
+++ b/app-text/t1utils/t1utils-1.42.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index de109998d5c3..81c76542dd85 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
index 5cb7c6784de0..66402b55d1d1 100644
--- a/app-vim/bash-support/Manifest
+++ b/app-vim/bash-support/Manifest
@@ -1,3 +1,5 @@
 DIST bash-support-4.2.1.tar.bz2 115200 BLAKE2B 2fab4f1bb0897af389a206051e63d2fe7a8cd89367298b1be51146eed7c0d788b23cec7bc81ce3056d26b5efc920043e67be003e4e6bfe25b503d532c74d9c07 SHA512 12ab39f5cffb58e4adb2137265d6c4f1a61b5f2e360f6866c21ead0a67e02a5445bd12fec5b00b26e5d6102b3aaab99b8b13539a67575067c3ef9b26c4ef8fba
+DIST bash-support-4.3.zip 249238 BLAKE2B 46fa031b4ba927e5a229fa9dc93a3dbe005322a1de494bc8cbeb56138f2c580ea5b39b203d46b59013e1985930422c2e4217234a317fbf8ee6209889c4047323 SHA512 fd9294e467129990bc9796cda309a5b0ec5af3ddbda7f141939622ec0d96c1573b35d9a20e99040d6a4e83b1e98c1f6b847c77d055cca9492922e1080dc64118
 EBUILD bash-support-4.2.1.ebuild 464 BLAKE2B b598a5072daf40141ea9fcd43dbbe203a5e330ee5c3ef6b9ee900b2d0cdd90108b8b72b39aea85ce9ea750fee7334cc18a4b21744494239ea85929febd1e464a SHA512 cf8a86c5ffcfcbede66d496f11225928ff31f4dfd30411c5e562340df8da856ae7381163a5d387be26d7293a192c62610521569bcafe4d77f040425dbcb6c4f6
+EBUILD bash-support-4.3.ebuild 591 BLAKE2B cd4708298939d237eb5e2aad39f8c50a9498d913df2c78e08e2b223911d1e680f451a465b55eaa1cb2dcc5214038c21ae3c81aa7f0d7ad87a544f46536c46ac7 SHA512 b74635aa284a48f9a54ab00c66681b003a8ce0d65917335afd2b40f43786eebcbbc8bb20f4022c9d1a18dcc6433fef62cc8d4ca56535301b103a6321fbf6ba86
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/bash-support/bash-support-4.3.ebuild b/app-vim/bash-support/bash-support-4.3.ebuild
new file mode 100644
index 000000000000..6de7fb8f0321
--- /dev/null
+++ b/app-vim/bash-support/bash-support-4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: write and run bash scripts using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=365"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=24452 -> ${P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+	dodoc doc/{ChangeLog,bash-hotkeys.pdf}
+	rm -rf ${PN}/doc || die
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/lustyexplorer/Manifest b/app-vim/lustyexplorer/Manifest
index f0fecda35f2b..5cb851b11753 100644
--- a/app-vim/lustyexplorer/Manifest
+++ b/app-vim/lustyexplorer/Manifest
@@ -1,3 +1,5 @@
+DIST lusty-explorer-5.0.zip 21036 BLAKE2B 6f9918242b5a12a2fd58017c54f10489113b21858e1522e0ff74a7cca41045c08144cb7b69bef2aa5e67998d74bb8472d547421cb737d2fdf79ec1ce4c51db9d SHA512 42aa2dea2d96c88cf65891a08a798c185849695c49663260fd133c34b63311d1db9073d3db2d6e4d1fd6907fdd4cf89335dacb0a5bbaa994924751f5a1be66cf
 DIST lustyexplorer-4.3.tar.bz2 17373 BLAKE2B 643eb4c7573932fa63030766670d7c398e307b72e08e93e53e31b7f21086a80196c8d4d7811032b8b945306fcdc7d86d59eb6b48ce0b79f38e628d6b4bec7519 SHA512 24ffa1fe5c1698dfa6093c7cfed2f08540ce130258df5e8ec135356ecea4c1f607f11e643ab859f551e63ecbbf6fc8a615a9514e1d4798b752cc97146c29c661
 EBUILD lustyexplorer-4.3-r1.ebuild 848 BLAKE2B 6593f7a5b016f867337acbef13f41c14861b2e22b2e15e4ca94d819adb8f3f98dad8fd335ba085a7fd711a803685fa948818439018b8b9798e295a005cf9606c SHA512 de1b05e0265a1eaac5c6f3b5b8338d6a7742a79fee37dce5d0d2f7487630b17d0259ff46fe1969ee12af19b4ebc346ce187759b39aba4c90d456ead88a451720
+EBUILD lustyexplorer-5.0.ebuild 1029 BLAKE2B c0bbd463db531070c74ba2d10597b1b3c865eb9302e9856a844b328026ffb6104153fb53f4122929a4a6058bdd104b3b8ef3b63f47f7379d0f94178c7792ff8b SHA512 b87de28c5abd97dcf5913cba60306975765cd005e50c322183b370a03c61c7a241f60efa3f3716462e37c89e4bb015717e029e7a0af924ebace0c7d6034f891e
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/lustyexplorer/lustyexplorer-5.0.ebuild b/app-vim/lustyexplorer/lustyexplorer-5.0.ebuild
new file mode 100644
index 000000000000..c2f6ad8affa6
--- /dev/null
+++ b/app-vim/lustyexplorer/lustyexplorer-5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+MY_PN="lusty-explorer"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=26146 -> ${MY_P}.zip"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="|| (
+	app-editors/vim[ruby]
+	app-editors/gvim[ruby]
+)"
+
+src_prepare() {
+	default
+
+	# There's good documentation included with the script, but it's not
+	# in a helpfile. Since there's rather too much information to include
+	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+	mkdir "${S}"/doc || die
+	sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
+		-e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
+		plugin/lusty-explorer.vim > doc/lusty-explorer.txt
+}
diff --git a/app-vim/tlib/Manifest b/app-vim/tlib/Manifest
index f159e3248642..4e6ae077cf66 100644
--- a/app-vim/tlib/Manifest
+++ b/app-vim/tlib/Manifest
@@ -1,5 +1,8 @@
+AUX tlib-1.27-fix-error-E1208-vim-8.2.3141.patch 1112 BLAKE2B 66456c43d0b840ec0bbec69404ac209ec5475274571ba0fda0a1e32af71677c860daa81dc9a775f7c1ccbfc8012e6119441da114d1bd38f1db6a351055d84f89 SHA512 7fec706e8a6b9b46e559236c6ba4f784411d078e21f634a8f84bec7df1c2d8e670cdb9330230f63879c3ee71ab05d2324055e55a26520e2428f284f40369021a
 DIST tlib-1.22.tar.gz 119979 BLAKE2B 2fe1231b6a075989c41aa2cf38d0964b6d9ada390d0729ea417aa1c2ef1a105a07d569f80c75ba91a55f7e68f349faab2dcda66741b0b1da59f76d68a5467e24 SHA512 b7fc7e3741876c92bbccc116d4e170663e3d178aa8fb546f969475723cd82e07d9470af37574f8f97cfd23b8ca8f5dd5daa2e7bef50e2f62beec0015a2355908
 DIST tlib-1.23.tar.gz 120827 BLAKE2B 7b86a1b0e22e499390239e5898d81c90ac1b3b989b929e3bde3ea516d05419fc8af19e72d5313df36ce856a4c7ee2cddbdbecbace835f24adefb1883d4e76e46 SHA512 5fd5d6e6ccd36117abcfca35173d28602a73b0773e5fc77cb8c1c8660f13dd7882c8a8de9b4335927b807c7d643c480f1371926b4ffb1758e53948132dee1d75
+DIST tlib-1.27.tar.gz 124891 BLAKE2B d8d79d1d7bc71e38d2315ab30df414521122cae8c8dfe2e43c8e87bad30685703e09a905d97a00cc2ef01a51369acfde75c37290d971a72d40ec61bce8f1fe31 SHA512 c7037a4aaa4bbb1fede9baea45644a8d1575c5813bc387a293856d8acbe2929cb641d317a4323b295dcc1c0e05091984e6b6eb9a3968503c4cde53580baf994d
 EBUILD tlib-1.22.ebuild 585 BLAKE2B b5d087fe5ea43d086e303462e0ed22b813799288b63ce97c6839a59f834ff769f45f2344144fb858125e28f4065c7596a7be881eb5fd2874b4990e9b6a82911f SHA512 71ed5d14775b3b39dd858c91f18c75e23bbc2f22f2b5f2fde18ef8a10d20a38890c02e15d0a8044a5c4e779e40012ef7ce43937c22a06f16ba486a7545cba733
 EBUILD tlib-1.23.ebuild 594 BLAKE2B b7b0952a34889833f147814fd3797c1666be3489d87d29cc3872f5c41dd0b246229987dd7cd176047fdfce747b6804d7485080c17f934986377b5ddc12cc3884 SHA512 8e9591d02a2cbc93e0a85cea2fef1903996d809d872dd7488450bab03b4d16cfdf045d67fb5516f9609bc71bdae55cc188b7f7a169919106ccb89182c844199c
+EBUILD tlib-1.27.ebuild 664 BLAKE2B 7e1dc96135703bdf19a9fee8d505712cf7a681c0266f81940119a8ee5e71b5c2ea3d38f3313d518279c0ed64d251c78b0452ee897643fa5cebdb0d7aeeeea34e SHA512 084eed573d567e7cd16868f911831c546e44cd7a857a21f0b9cf82dcce655ceddc74870718d5893eb34fffb78db01335338ec51b2e06177f6f33ee29c187ad27
 MISC metadata.xml 330 BLAKE2B 5bc04c4d654f684a4cbc8ab22e825d2704cf62226422deac9f32cb237f78c9b423e671f38df890ddf16e40e6c8228d5a0d29fd1207ac66daf5c1afde2162e947 SHA512 88a742c784330c95d95acd8043847f9f863c89c644de81439a12beaf06afe5e91a974d3ff2426d27d1b837271efe1f56029416fc5e84979927475cfac6612f7c
diff --git a/app-vim/tlib/files/tlib-1.27-fix-error-E1208-vim-8.2.3141.patch b/app-vim/tlib/files/tlib-1.27-fix-error-E1208-vim-8.2.3141.patch
new file mode 100644
index 000000000000..d52314fd6987
--- /dev/null
+++ b/app-vim/tlib/files/tlib-1.27-fix-error-E1208-vim-8.2.3141.patch
@@ -0,0 +1,29 @@
+https://github.com/tomtom/tlib_vim/commit/b5f9f6c83ade9b5640580bf9792a332dd453dfd0
+https://bugs.gentoo.org/828429
+
+From: Laurent Stacul <laurent.stacul@gmail.com>
+Date: Mon, 12 Jul 2021 15:51:16 +0200
+Subject: [PATCH] Fix error E1208 raised by vim >=8.2.3141
+
+Starting vim 8.2.3141 with the tlib_vim plugin will raised the following
+error message at startup:
+
+  Error detected while processing .vim/pack/stac/start/tlib_vim/plugin/02tlib.vim:
+  line   77: E1208: -complete used without -nargsPress ENTER or type command to continue
+
+The reason is the following change in vim:
+
+  https://github.com/vim/vim/commit/de69a7353e9bec552e15dbe3706a9f4e88080fce
+
+Which forbid the com[mand] command with -nargs=0 and -complete options.
+--- a/plugin/02tlib.vim
++++ b/plugin/02tlib.vim
+@@ -74,7 +74,7 @@ command! -nargs=1 -complete=command TBrowseOutput call tlib#cmd#BrowseOutput(<q-
+ "
+ " EXAMPLES: >
+ "   TBrowseScriptnames 
+-command! -nargs=0 -complete=command TBrowseScriptnames call tlib#cmd#TBrowseScriptnames()
++command! -nargs=0 TBrowseScriptnames call tlib#cmd#TBrowseScriptnames()
+ 
+ 
+ " :display: :Texecqfl CMD
diff --git a/app-vim/tlib/tlib-1.27.ebuild b/app-vim/tlib/tlib-1.27.ebuild
new file mode 100644
index 000000000000..aac06503bc74
--- /dev/null
+++ b/app-vim/tlib/tlib-1.27.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+MY_PN=${PN}_vim
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: a library of utility functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim"
+SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DOCS=( README CHANGES.TXT )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-error-E1208-vim-8.2.3141.patch
+)
+
+src_prepare() {
+	default
+	rm -r test samples || die
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 5dc9f89d3e34..7767069378cd 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
new file mode 100644
index 000000000000..bccd9035166e
--- /dev/null
+++ b/dev-ada/langkit/Manifest
@@ -0,0 +1,4 @@
+AUX langkit-22.0.0-gnarl.patch 349 BLAKE2B f26ff18ef2176a9e5f277e510202c3d87f2e40d29054d78b0d531d22c769ed2c18319dc0198a3f79a048a9f26027710334d80957f635ed05427581245b4d4525 SHA512 9f979f63839fb56a0536bf045b859fadb917177e587debe23c2e142fc05d78b06114e6c93125633aa244ac8e4e8965ce66336eb71099890d063353954c2120d9
+DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
+EBUILD langkit-22.0.0.ebuild 1329 BLAKE2B 7f1f29157642c945c4d53ce0c75c75d8a8a841c0b78f21c5b6a91ffd79c78bc1ca7fa29e7bd4bcc9343364a732bd69e087d01835e0157d3d5fc61ce8ec8765a3 SHA512 5207ed6c2c941903cf13750773ee814c2631c8c1d1cf55c4c9a71063f52345fe9398b52b621fdce91d7eb493ebbf55c5852c4a9be888c52e7768143299759c2b
+MISC metadata.xml 716 BLAKE2B e32738d2a347420bf4e01dcbcf953cfab18b1c6920a6b52b6278d9fcf26dd26fdb1fb8b490a2f050cbf33efb952768eea2bfeadeb40781783a69ebdad97001de SHA512 8c986d121e0afc68640dc9c5d1e6d3b9dc3bf79fd2ca783a9386c82319a10f8734170b330702cb82d4c790f22d67626606904072f8e57cee32dda5f5fa275714
diff --git a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch
new file mode 100644
index 000000000000..fb69768dc9de
--- /dev/null
+++ b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch
@@ -0,0 +1,10 @@
+--- a/langkit/templates/mains_project_file.mako	2020-06-09 09:34:36.677265457 +0200
++++ b/langkit/templates/mains_project_file.mako	2020-06-09 09:35:30.569451995 +0200
+@@ -40,4 +40,7 @@
+       for Switches ("ada") use ("-E");
+    end Binder;
+ 
++   package Linker is
++      for Switches ("ada") use ("-lgnat", "-lgnarl");
++   end Linker;
+ end Mains;
diff --git a/dev-ada/langkit/langkit-22.0.0.ebuild b/dev-ada/langkit/langkit-22.0.0.ebuild
new file mode 100644
index 000000000000..2fe1c770f737
--- /dev/null
+++ b/dev-ada/langkit/langkit-22.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="A Python framework to generate language parsers"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-ada/gnatcoll-bindings[iconv,shared]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/funcy[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-ada/e3-core[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gnarl.patch
+)
+
+src_compile() {
+	gprbuild -v -P support/langkit_support.gpr -p -j$(makeopts_jobs) \
+		-XBUILD_MODE=dev -XLIBRARY_TYPE=relocatable -cargs:Ada ${ADAFLAGS} \
+		|| die
+	distutils-r1_src_compile
+}
+
+src_install() {
+	gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \
+		--prefix="${D}"/usr --build-var=LIBRARY_TYPE \
+		--build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
+		--sources-subdir=include/langkit_support \
+		-XLIBRARY_TYPE=relocatable --build-name=relocatable || die
+	distutils-r1_src_install
+}
diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml
new file mode 100644
index 000000000000..1d15b41d3ff8
--- /dev/null
+++ b/dev-ada/langkit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Langkit (nickname for language kit) is a tool whose purpose is to make
+		it easy to create syntactic and semantic analysis engines. Write a
+		language specification in our Python DSL and Langkit will generate for
+		you an Ada library with bindings for the C and Python programming
+		languages.
+		The generated library is meant to provide a basis to write tooling,
+		including tools working on potentially changing and incorrect code,
+		such as IDEs.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6b3adda2a40a..a79daf5e131f 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index 806ebfad61c8..277c05582c23 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -4,6 +4,6 @@ DIST asio-1.20.0.tar.bz2 1845826 BLAKE2B a768dc0b9ae380bef07d674507f7571d0bc47e1
 DIST asio-1.21.0.tar.bz2 1967398 BLAKE2B 95e0ba44910e7450e614011b487acac0cd292302c0f502ec678639b70af7e6f9b86ee2c50c7f7e3e3437ce4474323e44b5e371c08f3a9ed464ffb3f428de728b SHA512 62252b2d3ca4fb99579c5fe57bf64b700792198dd7fa45acb4af7f64e83494bade1885b848f9e364f4c42d9db025841324cbd9a0fd3fe45526e7e4be6f60f8c0
 EBUILD asio-1.10.8.ebuild 921 BLAKE2B b71d193effac85b1774bf187f61b92d40d23fca104a210d18471dfb1b5c7e0d9d9615ba740627013493428ed355156bc927e4502eaf21d2c83c3340ff8ce865f SHA512 022d5a995aa8b5aedcc864fe903c8c4611dc7d5bd0f6e5e3492444d4d5ca374093cf74c08b5a2119f851894bfbe9bfb760f2c3ed2e2945a09ae0df3cb7626849
 EBUILD asio-1.19.2.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
-EBUILD asio-1.20.0.ebuild 946 BLAKE2B 91a50e5f66e132353c4d822df9f5401a662be2257a70e700c2e80dd476ee028bd1030dbb10ebbd9c52a525f5a528a7ca0294237a155eeec92ddaa8ef6e0e278c SHA512 8a21e1e1397b5f7c301cfa35ecd7347cb07b313c0dedafec9b1ad18a4be11f77daaf9cba583a956bdc6ba8ac491fab055bca081c9251e722be1d2f3004b2ab1c
+EBUILD asio-1.20.0.ebuild 941 BLAKE2B 451a472e38271e36d7bf4dc660c251475ef2781b748c4215330ea0b7db93ff1fa940f119d2fc98893a9667d68a34f9cc7132ee8b3e8b8867450beca8a7436830 SHA512 2cab95165d0414b7d5209cc8938a3f33423679e5909540aa2cdf23ba988e7c122dcb93564b4746566ac369306f495dfdc125082a62a2f0ebaf7352a0880c9fe4
 EBUILD asio-1.21.0.ebuild 946 BLAKE2B 91a50e5f66e132353c4d822df9f5401a662be2257a70e700c2e80dd476ee028bd1030dbb10ebbd9c52a525f5a528a7ca0294237a155eeec92ddaa8ef6e0e278c SHA512 8a21e1e1397b5f7c301cfa35ecd7347cb07b313c0dedafec9b1ad18a4be11f77daaf9cba583a956bdc6ba8ac491fab055bca081c9251e722be1d2f3004b2ab1c
 MISC metadata.xml 487 BLAKE2B 57785b73f498590d36241612367eda9036cc4ce85baa6c59e45a4c4f0b696f24f7bbe012eef33dd2e29a9c82fad82f75639e55f9c7a6e2e001b7ab48b65787cc SHA512 4a4f9713ea7274f730707dda0f2de0e0c19e50166466c0b8c3e5053e44fa5df02866235cfd97ebeaff15271cce662f1ae19383c0023813d429eded937d9b9cfb
diff --git a/dev-cpp/asio/asio-1.20.0.ebuild b/dev-cpp/asio/asio-1.20.0.ebuild
index 0b91e779c0be..0e025f305eee 100644
--- a/dev-cpp/asio/asio-1.20.0.ebuild
+++ b/dev-cpp/asio/asio-1.20.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 3c9d06f74c98..c9b1ee28b77b 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -2,6 +2,6 @@ AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc3
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
 EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B 68116cb37b4f39dc0c8d2b1d7132c905c207a04b22af6c3c921882f877b85eeb0c6d734905ad4da1837abc5fa952340c666072fe3d25ad5a190f5587f80e4a6d SHA512 cbd8d53c88e299235cff7c7e1517b40d8a1ce03dd099511357677797a3826b82edd011153314e2518e87a15ef0cbf5bd7331081f981f6621695d4c4f5051a3e2
-EBUILD gtest-1.11.0.ebuild 1894 BLAKE2B cbd27fe4ea35ad137ad6357a486b29e39f35349eb5d89265b8ebd0be2c8caadfb9f8e430526993d57beceb996e2b8c37df2ac9785a99d00ccb72015a3634b910 SHA512 a5dd5222f22527665d108ab57d63c98ad7bc5a734ae75cbd17a6229c139d16dcb3004a7aa5e8127e3f69353f9a8b93c78f7d388775956e263551bdeb07fbea7c
+EBUILD gtest-1.11.0.ebuild 1891 BLAKE2B 44442b28f217ba13eaba8ca5dab9c7265bb064f8d31e822d7abcaa7d48aa58de2a246fcb6d5ca02075b3ef40e22776d29685428f7dddfc8a3490d89c1bcd3097 SHA512 dd58dcba3d0c2ef6447b7bb2315bb443d4e592f331d581c860c834ecdadc7f0f17c8cf2ecfe1547e8667430ecf9aac8dc65fbe4b355717120395edf9557b47c3
 EBUILD gtest-9999.ebuild 1898 BLAKE2B 79ce4ea6d5691411bea3f6b18d890e323040948e3b34c9bf538cad4d666efed3741b6114d5b36bc2190ae155cc18a16c50d98acf17a96328a66eb7c375c2e56c SHA512 7c9ab9fd7d1491bc36032df95b952f0d5cb53742df962fb7c270fc30886b3db9ce317123231344078e8db600c8335f9a4f542426daa5840eb7a22bd517fd3448
 MISC metadata.xml 566 BLAKE2B 9500d2b76c2ab413e2113a67dc071ef02e3520e2db4996c04205f0d97ac3cc1b2a5f412da27460e9446920765a76507b85aed5d6f2c01a3399ffe095549a4c44 SHA512 abe19d395e258cdb2dca0510cb8d2b4acbc0ea907493672442c1343d9b68a748c244c2ac10044a4e1c659c5bd1e89159fad8ba267fd1d0643447f5d2691aa92a
diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.11.0.ebuild
index 25903a00c3b8..cf24d7feea7e 100644
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.11.0.ebuild
@@ -22,7 +22,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 739077626314..12727d0dfe7c 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mtop/Manifest b/dev-db/mtop/Manifest
deleted file mode 100644
index 165447f5416d..000000000000
--- a/dev-db/mtop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mtop-0.6.6-globalstatusfix.patch 623 BLAKE2B b64d931cb283da63d6aaf8affa21905c9289c681bd24a0ff5c690123e023e45cca9506a3d750a5871c07598b8672da504a1d5f7427ec9419005c05e0e9f3dffa SHA512 848de7bda1a79bbe51b139b149720872a57e4fa12161fc822e69f393586817acbe14571841df5d327297546b4ad3a2725b7cd8d1815f80ffc0a2dfcbb9ea5005
-DIST mtop-0.6.6.tar.gz 48161 BLAKE2B 6e1716d3b4b1617b1b78ae0bac3e363b17264bccd65a0b5831a7cf574fbf7826f5041829084c5af614d1f922eb368e33db8d31f0b12103d18661e7aaa6681616 SHA512 9befb1d44ef537c4abe0246ebbf20019499875d7e8efeac2fd1cf068dc577c2809bb0333ebf633982852446a0160d73ccfa0006dcfa42f7d95bbbf765f12ce17
-EBUILD mtop-0.6.6-r3.ebuild 689 BLAKE2B ea6a6304040b14c18ab9ec2b94e5510a46ff6ab19b2eda1f75b8b423de4192ad2965d74bf5810a28e03f89baa01fd4580153ec205faf9ab934d16a750faa63ed SHA512 fe88f9bc1fd7f454183317ddaf0a02929d124ebac5dae2ee0deee4d777e8ae42ad4817d655857aec45c6b72e6c783b7ec0a2407afad98923c2aeec648d6500c6
-MISC metadata.xml 318 BLAKE2B 21c90cf7b35585a555d893d36053fa21a7b7a2ec9b7a3ad93f07b6ed78f82cdd200a7cfd256da8debc8d67aad094560242d3189d88790d683101082bc1732244 SHA512 f71e951966b1abe225c210be1dd093e12659009f44b4cad72b9594d16bd99f0c0e7c4df7a700efe0e15d4826e8407ee9896de9c5d1ece102006230193dd6a838
diff --git a/dev-db/mtop/files/mtop-0.6.6-globalstatusfix.patch b/dev-db/mtop/files/mtop-0.6.6-globalstatusfix.patch
deleted file mode 100644
index 1d10acc42a99..000000000000
--- a/dev-db/mtop/files/mtop-0.6.6-globalstatusfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mtop-0.6.6/work/mtop-0.6.6/mtop.PL mtop-0.6.6-r1/work/mtop-0.6.6/mtop.PL
---- mtop-0.6.6/work/mtop-0.6.6/mtop.PL	2004-09-13 00:22:03.000000000 +0200
-+++ mtop-0.6.6-r1/work/mtop-0.6.6/mtop.PL	2009-12-08 15:04:56.000000000 +0100
-@@ -568,7 +568,7 @@
-     die "Unable to connect to mysql [", $DBI::errstr, "]\n";
- 
- my $st_procs   = $dbh->prepare("show full processlist");
--my $st_status  = $dbh->prepare("show status");
-+my $st_status  = $dbh->prepare("show global status");
- my $st_kill    = $dbh->prepare("kill ?");
- my $st_flush   = $dbh->prepare("flush status");
- my $st_vars    = $dbh->prepare("show variables");
diff --git a/dev-db/mtop/metadata.xml b/dev-db/mtop/metadata.xml
deleted file mode 100644
index 8dd097be54f1..000000000000
--- a/dev-db/mtop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>mysql-bugs@gentoo.org</email>
-		<name>MySQL</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mtop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/mtop/mtop-0.6.6-r3.ebuild b/dev-db/mtop/mtop-0.6.6-r3.ebuild
deleted file mode 100644
index 9a6df615b6d3..000000000000
--- a/dev-db/mtop/mtop-0.6.6-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="Mysql top monitors a MySQL server"
-HOMEPAGE="http://mtop.sourceforge.net"
-SRC_URI="mirror://sourceforge/mtop/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="dev-perl/Curses
-	dev-perl/DBI
-	dev-perl/DBD-mysql
-	virtual/perl-libnet"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/mtop-0.6.6-globalstatusfix.patch )
-DOCS=( ChangeLog README README.devel )
-
-warnmsg() {
-	einfo "Upstream no longer maintains mtop. You should consider dev-db/mytop instead."
-}
-
-pkg_postinst() {
-	warnmsg
-}
-
-pkg_preinst() {
-	warnmsg
-}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index f6e53855b030..d0578582b6c2 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -9,7 +9,7 @@ DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B a14bdce3773f8cc50c72880d9b8158c32b546
 DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834 SHA512 df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f SHA512 525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
 DIST postgis-3.1.4.tar.gz 17269391 BLAKE2B 6070fb72c777f8baf9c520ec51cf436837fffb54f21af5b4cf800940240f2fb9fcee162b2d3817cbfd4e60c2cef37eb4cf902d9e9f065e537d8d9b8ec965bef3 SHA512 afd84b45b146bdae310580fc9f8a878dd658f9e74f99c41f5d143f32974d5f5017ab4190855dcaea915a31ac2a78d34bf5561f206965264de3252f2c2ac57683
-DIST postgis-3.2.0beta1.tar.gz 17061095 BLAKE2B 09f9bef789c45145b95c75aa747fa4bbc5ae93de423ca280c8559a484963272b170b0113e1e55ab3395c26094c1f35848d024326b2eb325ed3e176ddf17b1ab8 SHA512 7dbf2086baae792a80944477afe9d77a4094e2003ba432ab964d6c2e16f36b95a17b1cb4d977e16908245374b3f132ed27fce485b96635440b1ca626189f84be
+DIST postgis-3.2.0beta3.tar.gz 16906041 BLAKE2B 221a36f0aeddb2e10e297ef5778200ebd535ca0b6a876b73ae2fbcadb2576552817526ee9323f0e68c000b7eba9e8d9f79ed8379ad4ecdaa2be3aab477cc3b18 SHA512 6a3fdc12cd7247f1afad35b5821ef71aaf99717f759c64b59319d91268423f7ecd542ebd6a972cc15a73fb44a4064809e6149e2efd64a215558eae1ee6acd2b3
 EBUILD postgis-3.0.3-r2.ebuild 3373 BLAKE2B f343d54a11b140d87d811337aaba6c2224a7822f158285273d83db7fd7e2e34570760e92efcec9a1220e2e938f3af07f525800406925b5acd51fd2317cc95335 SHA512 6a6e2e25b80a8b4dbc5dd342abcf8ca0af46c6b83d0d6f66f9d30ed01213de5664da47c90cd57a6e2f0985eed4a3a06634e78c94a536d5ca8a04e9e70121e62d
 EBUILD postgis-3.0.4.ebuild 3382 BLAKE2B 5a47a8597294133f9c7448f4af04cc38351c64c7a4ebcaf74e69ed5ad5beb094d79ea269a45171cc7e7a7b21485536c0a237d539979b821f76699543c8840849 SHA512 1813d3a8bff65838e9e2ba7cfcdc460de23311ae6cebf419f30c50a9bec983b933e5e6557e993b8365f19632c67d9d96753dac612f901cb76a7a56705a729e44
 EBUILD postgis-3.1.0.ebuild 3318 BLAKE2B 8433965a9d7536d4909fc18eb09bf74718e94854b272b4ef7d660eb8d5114f28b6aca877c2995f56fb4d3bc0ab71e892f9610bd34dfe9b527338d77ec811f27d SHA512 3e1ddce90bd260bf582844e3464c3a9b926e98d6d584f7b4d52c0351d201c71d71eea87add34b60378ace025f739ed758cc4ea4a75f48a662958ff3ee0d51b7c
@@ -17,6 +17,6 @@ EBUILD postgis-3.1.1.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d
 EBUILD postgis-3.1.2.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.3.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.4.ebuild 3320 BLAKE2B 7a9497215d6a60d732d73fe2926bfcf0d193365d9deb286d0fa873260830bd3aa84fa2d9d2a9cbaaa386a8701c61eb18d6c18e8baccb78c538ea3dfa38b55302 SHA512 21e5f5cf8733619bd8ac97cb6508eafdb9e21131e4d51c6197a7f9067c74de847614a9dba87c7e7e8498a205575978c1a24137c8774ae1f8399336a72c01d7c9
-EBUILD postgis-3.2.0_beta1.ebuild 3235 BLAKE2B e1a0130efa7bb9ae055e9f7a59f42ee888e5cd71a0bb6d5d0d18a1b8f099c48688b44e7400310b019473ed1ca35385f34802afe55a7966023687526ac8930e69 SHA512 620606ead4f1bb8d9e258e802f379ae02295062ee8373ded4d1f9d2e4c6a63c26e1853f8b20d1d33c3197cfcebd554d479ba447b945ed4595be101de300e47a7
+EBUILD postgis-3.2.0_beta3.ebuild 3235 BLAKE2B e1a0130efa7bb9ae055e9f7a59f42ee888e5cd71a0bb6d5d0d18a1b8f099c48688b44e7400310b019473ed1ca35385f34802afe55a7966023687526ac8930e69 SHA512 620606ead4f1bb8d9e258e802f379ae02295062ee8373ded4d1f9d2e4c6a63c26e1853f8b20d1d33c3197cfcebd554d479ba447b945ed4595be101de300e47a7
 EBUILD postgis-9999.ebuild 3243 BLAKE2B b12d44e623a1d57bc6081b6395b85781dc2751ecaa66b854766329b11122157ceaca8ecb0d95a5924f25daf1b2bc2e28cce3487d98373b3d0e9a508ada0a3c52 SHA512 3faf7598a5f029cffe543371c44d82c0943b6672a04722b47bb4be6c6d6c320138e5a11fef38278e1a12947c9a00aeab68bde1c7e080e5e497540baa5717547e
 MISC metadata.xml 683 BLAKE2B c8f073c0062a603f415def147e6beaa4490bd816a5a1896bd1765495d4458af7fb18a324d22af3a7a0a0769f70b8ee1a3b2c3b9ed24d372b1b40fabccd94bd46 SHA512 1d4048815dfd9283745bda6df457906b1a9a14188de595b5ac13785e2e97158a435ad6996a1248946da9eab12057dbc22b4285c832343cb1a2b6f2a206174920
diff --git a/dev-db/postgis/postgis-3.2.0_beta1.ebuild b/dev-db/postgis/postgis-3.2.0_beta3.ebuild
similarity index 100%
rename from dev-db/postgis/postgis-3.2.0_beta1.ebuild
rename to dev-db/postgis/postgis-3.2.0_beta3.ebuild
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index f414542a7e53..b4a4da3da52b 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,4 +1,4 @@
 AUX fix_rpath.patch 1792 BLAKE2B 38d89cc47984b4d83e2df79b444cba657b814a0d9f80d0c3172c49984a7c22eac40d7c880872be632244fcc2efbf24c52b5613ecbdef624db47df97d6c27c1c1 SHA512 aca59f03c289ed2ffc1df1a387d7f141df56968866187324d14239258c6b270a8a56739bfea7c8398af90f52c5ec7a87eedba4194eb3b097cd0df05cc8553964
 DIST tokyocabinet-1.4.48.tar.gz 1000485 BLAKE2B 4da2659a90dcee1cc99be286fe0e286ee75bd8179b75a944f229a3cc04169b8007220e36400d4934a7b5fde554bbc1783c4813fdf44b4a3530882ea0a8ef258e SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440
-EBUILD tokyocabinet-1.4.48-r1.ebuild 1511 BLAKE2B 6bd4c856539aa600e54246ccc378b72cf9e3bd6ca14b48b21454ee3d261ba626ced6bb0b9b5d8302375568557d790aac81198d0039dd9f0921dcecff81a59022 SHA512 a43ba8be64d4de30619c46cd710c191c47fb5d51cebfcdc366720590c296ff4f55a8c64dc908a1c0567ee2a4543bf6ba55c5b6d6035fe9fa3ae205e87ca1aa96
+EBUILD tokyocabinet-1.4.48-r1.ebuild 1481 BLAKE2B 78a11e0c030b9531600729d0ba39ca016c83212add6a89f8c154f51f6c0cad873cab4dff2335973ade7477d4cae029e9c931293a3f866ba44919a0a0fbe69c0a SHA512 c51718107640160e03905c3cc650562b0116894315c44a7dd64df38deea2662b8899f862675065cde55504348e34ca26be293912abe311d9e81f2cd805bec700
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
index 4efc8e3e6d20..df6c7e422489 100644
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fallabs.com/tokyocabinet/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bzip2 debug doc examples threads zlib"
+IUSE="bzip2 doc examples threads zlib"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )"
@@ -46,7 +46,6 @@ src_prepare() {
 src_configure() {
 	# we use the "fastest" target without the -O3
 	econf \
-		$(use_enable debug) \
 		$(use_enable bzip2 bzip) \
 		$(use_enable zlib) \
 		$(use_enable threads pthread) \
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 7c5cd956486b..b85769d887fc 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 2cffa837372d..cf09eda05285 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,5 +1,5 @@
 DIST esptool-3.1.tar.gz 6897273 BLAKE2B dcbba13e8775afd3cf10cdeafeee5e9e3c0d2e9722a95076a868b669ea3a11a56b48a053e1b19787c6da330af6d01f9f256a92c0be527d4a7d9848f646f194c3 SHA512 5edaaa376932acc9e7ba717fe931ec1e14b80d1eee415fcef4c69b30b375cd61887ac52a20dd1001d215b8d739019d6b9f624d294d8d76ff112e630d52f7f15b
 DIST esptool-3.2.tar.gz 7155428 BLAKE2B f81a8b77f1994599c3302915915e225249a5e735accbe47c8936de47564e47a33ae711df47c57e599d980b450dc4d710f819087a97d086b9d0f15a98622c0da4 SHA512 5e67b3a17190e051d7706ee2dbbe855488765a7bfed15b15f5a04022c3fbf19112905ba6a672c37b1bac5501d45d477cfff07c004cd83b2d1a111430992cefc1
 EBUILD esptool-3.1.ebuild 1400 BLAKE2B f9b7ae21c251b8288c4035f2c1aedbf48e7cceed5d6a8f9c4422c059b4c0d08b5dfbc1d9d7604f9bbbdb45e6deceb9c609abbe1319ef2b340bd03c28e6822d6d SHA512 9f8431ee5441abb28511410adfd96a824328dd2a713671fd51f9ee69e42d69d6dcdc2bae2d6f72fbf1fd3ae24768ccef9319d390f3322be688bde9c5463de4e0
-EBUILD esptool-3.2.ebuild 1423 BLAKE2B 5de48ee65aff406c13a6cef22e3d80c23414be6ffcd8d32a42ddfc09546bc52741d043d0a56760642b4a053439e4f97aeef1ef3dd286a526bd098fc70ad68777 SHA512 e2cdf48c9b44d61a0b2165f93043f66e730df8c701283fa416bde025fbb65336f77e9587ae106175c14d53dcb6ad532a66182dc71771751a9925d41e918e4394
+EBUILD esptool-3.2.ebuild 1421 BLAKE2B c15f2a10e98031acaa71f54eb0346a3d060924f518607f5645bd3b32006d1ac4d15844023f9b78d16cd150b2bc7561c0951ca3a8a2002cdc887fde012843e5b5 SHA512 1f0e339a7e0f9a5b6c5978b46ec38974463ec3b6bc40b00c4be82ddda44b7c7d647f207c722283bdebcb435a7f7effb3bc1fbbc766f9bfe2e65316bbf69992b3
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.2.ebuild b/dev-embedded/esptool/esptool-3.2.ebuild
index 7bbcbc5535ac..ff024776543d 100644
--- a/dev-embedded/esptool/esptool-3.2.ebuild
+++ b/dev-embedded/esptool/esptool-3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1a7765869b41..210331b7ab70 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 81f3f0d35ebc..a1e4c41004fb 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -2,5 +2,5 @@ AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa6
 DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
 EBUILD ant-contrib-1.0_beta3-r2.ebuild 1814 BLAKE2B a2bb1cab559d3e71813493337aa09865010665855ea4321e8cbd4132105d09c169da9fc1a4dccee2931d586fc63f225a39d95151f4d23e8a86bd4d5d9b556c17 SHA512 e46e91963aa9f9fb1fcfa61e4689fa9fa06b2c880ee4c21bfb70bc1f55725d0e59153b8a978856bad417afcb7ea07b30035e64fee2b5ee84fdfb91fa86185d85
-EBUILD ant-contrib-1.0_beta6_pre20201123.ebuild 2269 BLAKE2B 3eed3cd16b0b73c5991f421cb854528c5c7a81619d05c015236508835e571bcfa9ea83a6ea74f2901122041b29cc2065faf3f8dab4293d10ad360604921ace93 SHA512 0e492df4e615af11202b2df13c7808a3c1c5df107680bf124b2558fbb939a60fe34643e7da553e1abb3c25e8ea2014cf9ef555b48621f8e4e847e384f82bd0d9
+EBUILD ant-contrib-1.0_beta6_pre20201123-r1.ebuild 2250 BLAKE2B c3bace5590d1308e39bfaed86b83b460b6720443b480acce143afb599c73eb3382afbbe25ab8609eef1242919b26a82f7a94432e3a5c944a2fe0c0ee72008430 SHA512 10c1aac61554823dd11f0f360c7c50682adb24973e15b351107e2bdcf774a3395f08178df47098f8678c69b416e75d334a88c58683857f6b8cb88ae6614d67ff
 MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
similarity index 86%
rename from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
rename to dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
index f652e7eadd71..9c12dd37e55a 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -4,7 +4,7 @@
 # Skeleton command:
 # java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
@@ -14,13 +14,16 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
 DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net:80"
+HOMEPAGE="http://ant-contrib.sourceforge.net"
 SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
+# Too many tests fail
+RESTRICT="test"
+
 # Common dependencies
 # POM: pom.xml
 # commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
@@ -31,11 +34,11 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 # xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
 
 CDEPEND="
-	>=dev-java/ant-core-1.10.9:0
-	>=dev-java/ant-ivy-2.3.0:2
-	>=dev-java/bcel-6.5.0:0
-	>=dev-java/commons-httpclient-3.1:3
-	>=dev-java/xerces-2.12.0:2
+	dev-java/ant-core:0
+	dev-java/ant-ivy:2
+	dev-java/bcel:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
 "
 
 # Compile dependencies
@@ -43,18 +46,14 @@ CDEPEND="
 # test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
 # test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
 
-DEPEND="
+DEPEND="${CDEPEND}
 	>=virtual/jdk-1.8:*
-	${CDEPEND}
 	test? (
-		>=dev-java/ant-core-1.10.9:0
-	)
-"
+		dev-java/ant-core:0
+	)"
 
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
 
diff --git a/dev-java/jnr-enxio/Manifest b/dev-java/jnr-enxio/Manifest
deleted file mode 100644
index e95ad7555626..000000000000
--- a/dev-java/jnr-enxio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jnr-enxio-0.7-build.xml 17106 BLAKE2B b008c295c93839e2bd7086199b4b81c96adcda8ad26e33ece7b0a061b53041e6f481bc73db290d1d9fb15f7bed5a1a3649b79ad20cbcdef299ca6544bc1c2c4a SHA512 e655b5c8900ef050f45fc2a59dbfea520061fad94380d2e43757ed35f676a59f0816d006b4c6c3100cb063c29b44eb6e168edee65027a4a86f9c523ba018ba5e
-DIST jnr-enxio-0.7.tar.gz 10520 BLAKE2B 762c36ad59473d6be4f2c2b8c62ce489fe46ce30afe9b32101aa41ab703c50247cfa0908499f8c2fa79c2ac8c33972abe203984c5cbbe5111416e4684e4c79ed SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834
-EBUILD jnr-enxio-0.7-r1.ebuild 941 BLAKE2B 5e3cc61f215fa1432d6d2a01ba4099d54883fdda044e50f5323e75546b7ff602ac741913532c34efe1c0323639b6ee0c3be9c43de58e340d64a5e47777d3b12b SHA512 e3457d222de26e86948170130453b6470c5f7e63d7e01cf5f42c39389c775bb6322523e93f3d589d99ab8a31b8a39fa0a25d73e1938709207df742c16423c12f
-MISC metadata.xml 325 BLAKE2B a5e522a466e1394c04203a7add3bd2ba2eb53a291be6530afe36c43d7b84c411f675c41bc1f751d0cf0d6a5d550499275106ea913f094fb4cbc4e83ebefbf8a2 SHA512 9ffecfa855189daef3b3196f0829814180ccf556284709b4d3280bbe75649ac286b925dc4721b5b4e032289261b63e23004f96dbabc2a7447805a8d43c71515f
diff --git a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml b/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
deleted file mode 100644
index efdb518451e1..000000000000
--- a/dev-java/jnr-enxio/files/jnr-enxio-0.7-build.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/6/13 12:27 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-enxio-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-enxio-0.7"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.11"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
deleted file mode 100644
index a5257b885a5e..000000000000
--- a/dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Native Runtime Enhanced X-platform I/O"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-enxio"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-ffi:2"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/enxio/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-enxio/metadata.xml b/dev-java/jnr-enxio/metadata.xml
deleted file mode 100644
index d8701322c286..000000000000
--- a/dev-java/jnr-enxio/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jnr/jnr-enxio</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jnr-unixsocket/Manifest b/dev-java/jnr-unixsocket/Manifest
deleted file mode 100644
index 6f1f7f919bab..000000000000
--- a/dev-java/jnr-unixsocket/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jnr-unixsocket-0.6-build.xml 17192 BLAKE2B fc3e951c539e98bb9d47a32e232a1838c90e4f25ab04756884ff7fd8ae079df9400e204b99e503af3bc12bc7565bcff681920c3b22d786ee7574544094ba0758 SHA512 d9d33107fa8d28ff5630e806a6a0415cba0fb0962520918f6e6373163a6eefb6ad58a4c3a1f87ca041f6c0dfc48c5bee95e729d591472199b8f07153f9ca9426
-DIST jnr-unixsocket-0.6.tar.gz 6756 BLAKE2B a011f3f660526b0a7e4973a5e2168f9b0ee8a408ad2c9c1b622d9aae7659d915e258a0588f010fb56e0ac5740590b89988d77579884930f70675aff4ffe056bf SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249
-EBUILD jnr-unixsocket-0.6-r1.ebuild 999 BLAKE2B b4c078dd766043c55711f70dc47a59ed023dec0d0e3f3e994b366bcc8427a4b91ea52f46b8fb4ecb496d0e3efb99aae28c5330e2aa397d0512e142048e976ed0 SHA512 3ca6ba21c64f3dec69f2478258c086c54ad609bbc56a7c07293c13439267968682cede11d7e3ca17649df02004c6ff8dcd23ea49408f01a44d795dbe56aa4908
-MISC metadata.xml 330 BLAKE2B 38f412c704fb21b6182b0d202d1685c5522891e500641100ef1f2edcde559fa1f11d7e685524499ad147b1d78d4e253b12274f46db18f758ece8e79a6b645dcf SHA512 aceab1c9614fc05c6d75560029a84533754a10eba547b03726a00ca35a6181e0290c931e051bd315e315f3310ed9ec8788e379269ccaa2bc952b4a81a7fd6225
diff --git a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml b/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
deleted file mode 100644
index 4ef23a7785e3..000000000000
--- a/dev-java/jnr-unixsocket/files/jnr-unixsocket-0.6-build.xml
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/6/13 12:11 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-unixsocket-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-unixsocket-0.6"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-enxio/0.4/jnr-enxio-0.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
deleted file mode 100644
index 4b92a5c3baaa..000000000000
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Unix sockets for Java"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-enxio:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-ffi:2"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-2,jnr-posix-3.0"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-unixsocket/metadata.xml b/dev-java/jnr-unixsocket/metadata.xml
deleted file mode 100644
index e746f31f954d..000000000000
--- a/dev-java/jnr-unixsocket/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jnr/jnr-unixsocket</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/mina-core/Manifest b/dev-java/mina-core/Manifest
deleted file mode 100644
index dcf310a30b0c..000000000000
--- a/dev-java/mina-core/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mina-core-1.1.7.jar 272148 BLAKE2B 08017722d3e85f233725c0f3495372d4c189a18bea346ff56ab2911dd35fa65df3697101a577424c8702b4fe52dee2701a13bdb2a90f187ff9df0f038fdfa02e SHA512 44f2f94aa356ce1b4ac0379ecec7b76b15210e54314c911bd8ba6d48910415363c9a34dc50e29b8e04ad08a371398ad9e2a00065a44b71c25caa3ef14a72b832
-DIST mina-core-2.0.7.tar.bz2 1953751 BLAKE2B 973e7d67f2328a8bc9fec31f693280b7f640fc3856912e7186b9c7f1d4b506303c4857304f26138a07b0cc10b6e6ff7516be504388980e4042f0ac450ddb5fbd SHA512 406f5fe9c389dc0a2ebe602207e1c914fee308368d5a1e15815ae4c160a986a30a453a1bfb4e010452de87aa28a6817c02f0b5a669ad272fdf603084e994e57e
-EBUILD mina-core-1.1.7-r1.ebuild 507 BLAKE2B c4952376f87b5cc28d69f72e019ad3f0c6b628f72c3372f60cda7a4a3cc04f5ba4b74a65b3602d778edc72bda1a473da017dc5b29231455d66b0ce5544dc0685 SHA512 80b5b73bd90119d97b2344852e7a801970f540ffcafb90f4fa4c255dbac4c56d3afd3f017ce63a62500f342161720ac6521b376a620e94bc355f6c22bdcf6e8b
-EBUILD mina-core-2.0.7-r1.ebuild 706 BLAKE2B f00019624844162811f6bd1432de45835cc07a441371978328a9d299eecddbfe67bc74943cbb107c6fc28932fc0ef710b1bb932a20be79a954448f845386c0ab SHA512 1ef2dfb2ebf9bb12fc3dbadf3fe54fdc93de9b03d948a54ce85fab12115805dbb1d9766b1ac703448e8e51eefddda54146bf92487a8dbc6d32dca9aea24f04f5
-MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/dev-java/mina-core/metadata.xml b/dev-java/mina-core/metadata.xml
deleted file mode 100644
index 6ef2d50cf07e..000000000000
--- a/dev-java/mina-core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/mina-core/mina-core-1.1.7-r1.ebuild b/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
deleted file mode 100644
index bb2d5a60560a..000000000000
--- a/dev-java/mina-core/mina-core-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache MINA Project"
-HOMEPAGE="https://mina.apache.org/"
-SRC_URI="mirror://gentoo/${P}.jar"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
diff --git a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild b/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
deleted file mode 100644
index 443f413218fe..000000000000
--- a/dev-java/mina-core/mina-core-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="apache-mina-${PV}"
-
-DESCRIPTION="Apache MINA Project"
-HOMEPAGE="https://mina.apache.org/"
-SRC_URI="mirror://apache/mina/mina/${PV}/${MY_P}-src.tar.bz2 -> ${P}.tar.bz2"
-KEYWORDS="amd64 ppc64 x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-CDEPEND="dev-java/slf4j-api:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="slf4j-api"
-
-JAVA_SRC_DIR="my_src"
-
-src_prepare() {
-	default
-	mkdir my_src || die
-	mv src/mina-core/src/main/java/org my_src || die
-}
diff --git a/dev-java/swingx-ws/Manifest b/dev-java/swingx-ws/Manifest
index ac90644f3352..29c0facf7da6 100644
--- a/dev-java/swingx-ws/Manifest
+++ b/dev-java/swingx-ws/Manifest
@@ -1,5 +1,3 @@
-DIST swingx-ws-1.0-sources.jar 281598 BLAKE2B bf978c90d302183818a9da0bc2151b03bc4284d83bac9064a9dfc4db1a1bc95f28e835c45e6aa57a6b47a407926d01273c8ec0ea3bfa22052608c0106ca52a53 SHA512 722f8642e3a7c7825dd44cf01eca624b1d8a6bbfa829dbd7be326b53bf9d5467f48293489bbac6466ba9e74d991caaa6c9d56f0b7a08d205133926413517ca28
 DIST swingx-ws-2011_05_15-src.zip 7010679 BLAKE2B 529507f3a7f48d38eb755001b2d442d040adf884a31a49c00f57fc638855e96b195a50813196fdb7318860b0a547eb8220fdd2d05ed613c2cd7d83cb8b7dd7fd SHA512 1929bcd5d615e336fbf77f5c0406a15f0b8aae1ea2167106b8efe2708bf365b39a2313d2a22b5f77ca9559b161db5c50dc18d0cc4cebfcf7a0e4e0c978d4d5da
-EBUILD swingx-ws-1.0-r1.ebuild 1392 BLAKE2B b9b473f8dd3bb53e8a707c03f2356cd5716556078e45dd21c290ecaee4308149cdd88609ff314845aa2384334352bc1ddc671a70dbbbd2647c7a411ba9cce96c SHA512 7fba5f418d1f17920d2e5813a33692c615c028455457637e8e7ba8e9a479ceebe39500dd98ab3184291836552f0cbd3ebaf9498694b2b91519a49b905507eb16
 EBUILD swingx-ws-1.0_p20110515-r1.ebuild 1748 BLAKE2B 61caa7e1ff917faf40d1d2e4996d2de87cd92b525ba3893c320f58c081a62b468c85737160a76cb834ff9362b0a839b81b0659198ef1377531053cd949f7b53a SHA512 5e6a936b62bd3bb712b0ad7881f9335bd8a7757fd78b978dc97c89b6bd150e53862d78055ec4329a49ba466919150fda5af27ced9588cea0b7cab458a0f6a35a
 MISC metadata.xml 460 BLAKE2B 745c927a4a496be4c3ea9ce20a9e70bfcd85887421cc7836f056a2c048101c423f1c2e6c7ae39ebbce80e7f35ee659809463138dc37b5ddc50254d28b8871f79 SHA512 7cc9fcc1d808f78b4b38559af09e21dac1e8832b4e2d21e3a81abfa3881e54572d81fe18c5c646cf0e75179942a007a0bbed97e1809610366edc7de701b49121
diff --git a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
deleted file mode 100644
index bb050ca9a791..000000000000
--- a/dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Utilities and widgets to integrate Swing GUIs with web applications"
-HOMEPAGE="https://java.net/projects/swingx-ws/"
-SRC_URI="http://central.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-httpclient:3
-	dev-java/jdom:0
-	dev-java/json:0
-	dev-java/jtidy:0
-	dev-java/rome:0
-	dev-java/swingx:1.6
-	dev-java/swingx-beaninfo:0
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.4"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CP_DEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-src_prepare() {
-	default
-
-	# Fixes for newer swingx-beaninfo.
-	sed -i "s:BeanInfoSupport:org.jdesktop.beans.\0:g" org/jdesktop/swingx/*.java || die
-	find -name "*.java" -exec sed -i -r "s:org\.jdesktop\.swingx\.(editors|BeanInfoSupport|EnumerationValue):org.jdesktop.beans.\1:g" {} + || die
-
-	# GraphicsUtilities moved in later SwingX versions.
-	sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
-		org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar .
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 25f39c623c95..88f4bd4a2b88 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a68064be3044..5c3a327a327a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -4,6 +4,8 @@ DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
 DIST Python-3.10.0.tar.xz 18726176 BLAKE2B 77143edf733cadf7e52327a58782f0617b1dd0d132cf58e0f26d37a454bb97f82e7931118a6a71f22779d9b6ec4efca974c43c19a6338b4b24a9fd616b60cc89 SHA512 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd
 DIST Python-3.10.0.tar.xz.asc 833 BLAKE2B 295df19932ea076bb1a50acb38782055ff34fb235df0380fa361727eedb3ca68aeca2a31419de5b05ce128c2e21ad04605c226e7a61d508a17607f615e46e570 SHA512 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d
+DIST Python-3.10.1.tar.xz 18775460 BLAKE2B d2dbf875ef5f9cee6dfd66e2d2489b884813c6a4eb3ef4da25713361efebb9ab271dc7050de25d4b07808bd3fd510700975c733ca8f283caa7426d16f273a93d SHA512 1c559e33f1252e51bafb941c380de16f142c0735858363c84cb8dbed6767843de3af126889c2826ffb94bd4777d7cdfc31040301c8c74de56af52b80b1aa9e76
+DIST Python-3.10.1.tar.xz.asc 833 BLAKE2B a5678c522b486a246993616ee36ddb3f74a093fb5729d8d2da3cfc4de5c3e1fcf3f4f55504b7bbf929050204d22a89ff3c7750b599034a3d5c941666f54fcad4 SHA512 645d5f40e6e80a590923a48763f20dea7da3f3eea5825bb79e08618d81d1b8eee0ddee2b57503321a584280536e0671e4913e5ad450568fbbb44509c01d3907d
 DIST Python-3.11.0a2.tar.xz 18714064 BLAKE2B 54680f117b639fdebbe1300df4d4fcc43099d30d146861577eee7ad5d9a7de43b54bec0f058db58d4d7067a8ab31cbe344a276c837dddcd3df9105d2a5aa615f SHA512 9a7c4d2be0cdf5801aaf6ec6337390a2f0e711badf0e0e35bcf0e5c98f652c68cf523afb991e87f4a1d1604eed3d19c56654d55922986ab27234e82675b20391
 DIST Python-3.11.0a2.tar.xz.asc 833 BLAKE2B f3714b71fc1e167e2d5a9989003159606a5eb5288f6d44c5332d7fe101be79e411f035ad1fcc3acd930f9e02377ed8c45f6b981827405dc501b8b074b5eb3dcf SHA512 617181a854c884c6d3a79368000ca82430bc391573ae3a1b25f69939bce3d2d365e8ca7166d941856a78f3598ab4e7720a144ecb6c3a9de1aff5928799c2988d
 DIST Python-3.6.15.tar.xz 17223796 BLAKE2B c139c6f93ea70ad898d5626dfa964280a14de9676f0d9d55668ad91618b1ba330874cbba8d6526a87e53b585ff34e3bf242613ca3fb17ee60f362a9676306c7d SHA512 f1894d704c91669d94ec83b5631288bf1e0c73ddcf33cea0977575f262eb672caebc8ac00e34e9b99c321c19cc9a71d6081fa957bb8e23cf5bfba50f345145ef
@@ -16,6 +18,7 @@ DIST Python-3.9.9.tar.xz 19144372 BLAKE2B 3a144ca5e4b11b2fd09d05a4a40ddf3f622c07
 DIST Python-3.9.9.tar.xz.asc 833 BLAKE2B 41d05ee1ec256f0cab4e9d3540877783745f0f30e3f1177d01096b352341a90893c5c9523926bed8176bd304cbb1fd6619be3b4e375103874eac5e5ebc113135 SHA512 84fb739c60216ab9a7a487a0ec4039a7e85c7684ef1f71d8b3bc415ff2ae284f79474103ae05385502bc2510401f8cfb33d84dccf5d0ea9a0dd62528519d935f
 DIST python-gentoo-patches-2.7.18_p13.tar.xz 33296 BLAKE2B 91b711458aff4f6337ee1b34aff58d7edda6725644a64c9320076a1e04c816729ed163d82333cfe4dfef379a9ad5ef50ba00abdbbfed4503b0f92c8f0b7ca683 SHA512 97f3657a4a95e8492aa710801b974a56e6dd4636e475aea45cbbe76e7ae32d00f07b05769887f05e49cb0df8584ac9499a7ce842bad77f837a7c869f9b769b07
 DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
+DIST python-gentoo-patches-3.10.1.tar.xz 8580 BLAKE2B 58d165c6c21a6736787d77d5bbeb770adff7f3729a47f62d0b7c4f0982c15c6a50b326be33638f3fca5574936cbce35d26e9ce0868faa3b5a3412b30586b066a SHA512 f86adf4e5195b1eb13cedbf24c1956964ce56745f0524a62b1e7c6baf74c6f1802e05cf4c08519b147579945c0526ff0a0ffc01cfb4372c0ec4f403b25e81012
 DIST python-gentoo-patches-3.11.0a2.tar.xz 8472 BLAKE2B 440e31d70895a537bb89099cec440bd5de56cc3ddb65d71483f5f82eeb253fe4a99f87c41b8ad28ed039ffaa3eb48674de15b9e031572fd81aba4c1c79ad2ec0 SHA512 f87a7550fa20027c870500babcc8893c2c4dcaf68a25d8096e0edfa1f473fefbd0117bd847514f2784fe22cb0027b3b269c7bc7d7395c1f96932a56d02bfd404
 DIST python-gentoo-patches-3.6.15.tar.xz 15300 BLAKE2B f49fd96f6ad1a1c94fea6b83acd229a81754b86061e243044ead4b9a9d5122a2e43b270b68722c359c084c05a566a3ad70aa46588ab7a005ee560ee118b92b8b SHA512 cc33491a33f3f1d990cf494d53b91b74db761142e8aebe1bd4b128ef10a268ff945e5ba08daad39cee095612a8e52265d6988873ecf9c073377cbbc10735aa39
 DIST python-gentoo-patches-3.7.12_p1.tar.xz 19112 BLAKE2B e9964244af3db544dd6e96d85ca4bc24d7131b48eda85df5bafa3fb36474a024cecbbf4b27324e1f35f76ae6a1aed31dd7896e831b79b574b45a4371afcc7e5b SHA512 9ec996c2904f99bd6651ed1b700eabd91f2b82b1e9e0f3d9572243886a9c7139bf8ac2af04169485d3ca6339e1a87044cba203f6f0aee9609d2a1d53c812548d
@@ -23,6 +26,7 @@ DIST python-gentoo-patches-3.8.12_p1.tar.xz 16632 BLAKE2B cce7a41d020af1ffc55a01
 DIST python-gentoo-patches-3.9.9.tar.xz 13200 BLAKE2B 672e3b79094cbc791988639a5dde4c9e5622e91bef4310d26838716c65763ca69a12c6afef2f19487f4389974af009896e452c19783b0a491072d13f893af7e9 SHA512 3cd4ddd070ab48d9978e1136d237fc24030fd3ce6704371ce99815702a45d839ee26c7e9552b004661827759edd30222434e4166f9ee16f873ad4783c83f723f
 EBUILD python-2.7.18_p13.ebuild 10097 BLAKE2B 9aaf952b8a091ffd388aa0f4608a360111e112db3b2eebfacb8c9461e52500aed285b640b89fdaed4045b75190b4158e99f3c30259de490baf410e10320b3bf3 SHA512 6e493bca69c83840996c68308db8517cd3409c46f232a775165ced5dc77499d57ead5624a2bb6da27f19d950566964526584bc22f6ad6613137360036bcec143
 EBUILD python-3.10.0_p1.ebuild 10598 BLAKE2B bad03934af77260eedcb0af1e844544a4ede14cf40767f4252cfc72c84ea08b1f3ce32b124539db8e8140b60db8a3ce1c9df291821056e874796d892072f9a21 SHA512 ae316c4f0d0c499576faab6ae01385cccce842c423f0f15d94577df9d8aebab24bca10c0abf375ee69311aa49237b6b009a425e57e7e86900ccfb9fe305ef4d7
+EBUILD python-3.10.1.ebuild 10604 BLAKE2B 188e9b1cfecdcb0b90f729163d363fd2a468c1414944819f5540909efca508a645160e11cdf347d979610ba29e6d2f81a518525e73b8a07630512e17803afa07 SHA512 3da487cfdd0070f125e22b3df76ee3a9001c8a9d0c085b7cb2a7c0c4181188fa720dd6efdc5d6475290df8823caf9573256f7202b57d0ec89a51ea59700956a9
 EBUILD python-3.11.0_alpha2.ebuild 10868 BLAKE2B 41033d8e1163933cc602d7b8e4c81a30444f9d74aceadfd9760f9af33a594e077e521de007b41fb20f92bcf759feaf37c7d1dbf06be100e6dc7d814d16eace44 SHA512 c807c1fbb7ff794252caa75ae418ffd013a92e9d265c819b96192dec1429578487fcd0bea00ffa94f19025f8b29139780c65136400aa8a6efe065e4e0d6a4916
 EBUILD python-3.6.15.ebuild 9715 BLAKE2B f8b40b38aa5cd5e84f262fa28a127f36d3225f957b41fc80444f1e485ab3f160f8bcf50f18423cdc1789b1ce932544f26ab835b487d7be789b4dcb5b910d3cd2 SHA512 e82bd697f90d53de1ff6ce6d64426b9d9d110bad5cb8c5f466284396f70a2f9149dd91da67cb515d16dd56349d4089b2eb3ce06356c04f7ac350a8335f4329de
 EBUILD python-3.7.12_p1.ebuild 9610 BLAKE2B 6822b251e66691a26d20956b8d081c51ed1ec4924b8aea05a4b96e45edf8b32fdda008caea6412fee8a2ae0dc864da208912b0a240f1eff5434f6a4a34ffc94b SHA512 a51b4d926660ecbfa117ae26d20e123f92d4fb87cea786f58265a03a3978fff735a579cd0f0e821e716898a396cda03d5a1c2ce4b0e4e3345176f1beaced72c2
diff --git a/dev-lang/python/python-3.10.1.ebuild b/dev-lang/python/python-3.10.1.ebuild
new file mode 100644
index 000000000000..42698f3105cf
--- /dev/null
+++ b/dev-lang/python/python-3.10.1.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )
+	!!<sys-apps/sandbox-2.21"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( app-crypt/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+		export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb"
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			PROFILE_TASK+=" -x test_distutils"
+		fi
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.10/site-packages
+	fi
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	addpredict /usr/lib/python3.10/site-packages
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index a203251b8693..7f58143a02e7 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -190,11 +190,45 @@ DIST rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz 147853396 BLAKE2B 1d1318c9f076f
 DIST rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ff984dfa092ff3c1c5a3d1a5849b8dc5807c5885dff5eca020d0b1c404484197adb8e1ea5802886b15e2b8846d0f3aa4bb161e49dc39adc151ca7d57a988ff24 SHA512 53b57ceaf621248fff020de75434c8fe60657335852c88d14ea399c7935206caaff61ce159cb2f487510336981aa1d839b91153b9764ea21ced1fb6455a16bdd
 DIST rust-1.56.1-x86_64-unknown-linux-musl.tar.xz 255304020 BLAKE2B c379fb419b6fa1c73b9c426a4f6e46328ce2ac1beddffb1ed25922b3387147eaf0217d3904ccc14ce2b97952f1035760264ae5fc7a575f92bea84d9581d8b315 SHA512 b26d4b9f6396be87aadfbb4777d91c80cfe656570e2bf1a0350788ca45caa7178d4b91966e77c8cc4873e017fd99649ae6a82abad64b32a4eb1f5dfb3a20d45e
 DIST rust-1.56.1-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B aed2703ef8cdcdf076d6538fb968f465c0a884b4c11916470324116e56a5b93fd7118b8b167ab19007ac71201044789f58de3a7ee1b60dffc47c3d123db1b4a5 SHA512 32c042982da7bde6c36bcb33fd3d9ebcb469667c880214b703e7b2cf89467e7e2bf37282cbc128d0207b9e433b7f2bd028e0d2614b657b544a552aa401bc98c8
+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 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
 EBUILD rust-bin-1.52.1.ebuild 5664 BLAKE2B 16e4c51664da8266a87e0c562d1e556de386d19ad757f52258d1304253ef2afe0ceb59fcac0e91a663b6c38a0f4d7488e58828a957a89460f4a352323287ecdf SHA512 5b4b3da47378dd9369af0f19caea74d932036ece72fed8b602668584db0c0801a78ef65a98f8d9fa9feace9b040fbb86943f9d2fde2d20f74de13226f31e69c4
 EBUILD rust-bin-1.53.0.ebuild 5664 BLAKE2B 16e4c51664da8266a87e0c562d1e556de386d19ad757f52258d1304253ef2afe0ceb59fcac0e91a663b6c38a0f4d7488e58828a957a89460f4a352323287ecdf SHA512 5b4b3da47378dd9369af0f19caea74d932036ece72fed8b602668584db0c0801a78ef65a98f8d9fa9feace9b040fbb86943f9d2fde2d20f74de13226f31e69c4
 EBUILD rust-bin-1.54.0.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
 EBUILD rust-bin-1.55.0.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
 EBUILD rust-bin-1.56.0.ebuild 5669 BLAKE2B e20feafc001ad5ea01d4cc6729fc02d80bf4a3a23ae7ccb436c2eb702de4adf9adfb94150f794e5140787c0c7ec11eb3a2ccb3954ba0f8e709642c98b2935f0b SHA512 30c4641ac1244a03096fe6d089607ea67674cf8f1c9e397287eb1349a728cc78a58b4cf5b82d4205c5ebc91667e84bff01bd92f5c523e002129075f9c3b1f76e
 EBUILD rust-bin-1.56.1.ebuild 6402 BLAKE2B 66ed7b1c79846c0f7fc917a7db0aff3670113b4852939ee469140248fa4c8c25d7ba0f767e8d7e9cd1e764bc19a74c29982511dd4afb143511b4158e09f723d9 SHA512 6803849b71983f5eedb5eb4d7e98942b93f05cec1e5a2f48cf49ee9b00b83db12148ada267f88b97763de18595a6aef71735d5a256bf3b686f933d2e7dd14281
+EBUILD rust-bin-1.57.0.ebuild 6407 BLAKE2B 2c8ebc788c0ecf99ca5d32dbd21217febe446e29ec027736e78983721dfc8bf6e0661079def1ed62ac28607f0cf91255c7a9c5aff933be0d3984a5fe30620753 SHA512 c488a62fb974b6bf0aaccdb9a99f473ac04212d86964a5435c5f64d836d674c699a4b994528ee4120aab73b5f5c07d223b86b9ee995208820e0b823f57dd3ec4
 MISC metadata.xml 591 BLAKE2B 6f9d494e400400b8b957eaa3c242b5f096808cc8372360eac0d9ae4bffcd2aa75b35bad4acc7248543b08466d8616b0145ae8a9b1534db1ad5ee838f07f9dc51 SHA512 9f59ea60d8ec9b748eac0789fa6750f32e4867e1c2cbe106ce270acdb7306d40fe8754315f8c65a924af43d5b3e88f4f50dec6361299de80ef1a25665aa03182
diff --git a/dev-lang/rust-bin/rust-bin-1.57.0.ebuild b/dev-lang/rust-bin/rust-bin-1.57.0.ebuild
new file mode 100644
index 000000000000..f2f12b83f797
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.57.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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%/}/2021-12-02/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? ( app-crypt/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 6dcefa8a7592..8f95db8fe3f5 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -5,6 +5,7 @@ AUX 1.53.0-miri-vergen.patch 1962 BLAKE2B 0ee4adaf3e7dd85da66a9b2de0acaf430ee114
 AUX 1.53.0-rustversion-1.0.5.patch 13732 BLAKE2B af345fb7fc8bb3ab139ed0e14819b0e000a1a525703c11535594695151640fe360a089c460a7f1219f0b8010979d73de55fbdd223f32ba7ba296ed16b048ec13 SHA512 ec748dd5a0dbebadae3e98bbef40338cc945180560586ae9aee7a1ec7e94e7a061ba3f3760f11e8061accfab908128d048aa834da5e34387dd0bb0fc16e82af2
 AUX 1.54.0-parallel-miri.patch 1707 BLAKE2B 131daebf9a1a1c454adfb61ce781204cb3f78f1bd2d0985fb76a9743a5f74ba8504845110a8fa624ebb9fc03bfede6bf3b115d706788af76d4baf2234056c006 SHA512 934bc8edb46d4367328a522fb83f020e2fac09a6a373482e8b2110383725f4733c500045bcb6119d4fdcc5367401a5ca787fb2491f6bb5b25c41897adf66fd88
 AUX 1.55.0-ignore-broken-and-non-applicable-tests.patch 2895 BLAKE2B cd2fd9b237786f187afe8d60e0ee6b9d1451233d554ca168e2f9d2a58f775c707d4d0a04899f8884152c3064689fa3fa31716f3b77e0002136ca7348c63e415e SHA512 993028842080ebc158ffe08f78315caaefa28958d890147286b53965eccff4d21f2edfcee153a2ceba03875d6bb03a2af7acaeb2deb8ccb7a5dc17cdffe73f0f
+AUX 1.57.0-selfbootstrap.patch 1855 BLAKE2B ae532dd452011f00c1d5fbae7187a487a1f485576e11e548c5940f81f0e27822f1f566a42099e264ab43f01aaa0326e3f46db9d85d788b9b0607850cd2ff8c35 SHA512 bb0ad6d022bdb9c28faa9d1b059b45cd5c958e4a368b68c9720ba4207c257156f6243397b2493873bbd646ceb260216a0ae630e34f92928c305fe4ea87e4e7d4
 DIST rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz 208849064 BLAKE2B 1570536f63237ce04222f78c8c1d0592b3d0bacb62e2a1e2b87f9cd74c8d304837f9259c154e6ddfc5d0fc36c1d69aba34cb27d41346d4e7400ad1950ff19f8f SHA512 2af31290e1065a4611f34e6cc8c62ee494c222becfb21ec6707059c119069b0adf0eec23e56bad4a3cc8690b2556309ec58cbd9003a959983689cc46c7c63361
 DIST rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B cc2cef574740ea5eb632235dca2889a7c6a6941169ac011d3a888cdefb8e5a5af5bb9ade93207ccb6adc82eb6ae1b5ed605954cea2561163c538fcbbcdb647f8 SHA512 43abb6e19c1ca905cb2d047503f4473584e06b8daecff3b6e45ac93dadc2c7f37118e3b66124180a9951b2f5eedf212174a37c661a7775600bd200eb089801f9
 DIST rust-1.51.0-aarch64-unknown-linux-musl.tar.xz 209607568 BLAKE2B 8a8d677fac5aa68be8b689bd999894f0b51910d50d86d70db4cc9b60695703dd74b68578b72d9d410d2d163aebd3fbab0993ebf79486a103ef588cb849dc2038 SHA512 d7ca480f4e07f88a49b475d2fcd132126defff21c26a665d1b444b97ce5e44404f9106bb844a5e35d4933a51c2d8a5aabc8ee42a2515c02a559c81937920be4d
@@ -165,6 +166,38 @@ DIST rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz 139040728 BLAKE2B 1d7905411b556
 DIST rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d454086c93147737c7c144af288394512528e4ce759dc221d7371b62724857fe16e391949b5b4dac436bdcaef8bf817f577e8d951e1f4bae098d687b4a7bdbb5 SHA512 b175e3ddefd036fce29c80c65a86565583167f7859f0941dee6718fd71baa8596f1788a6bed5d992096959e1deda98dc9c10e8cbc896114b7938a05951c29f02
 DIST rust-1.55.0-x86_64-unknown-linux-musl.tar.xz 267291288 BLAKE2B b96e8fa1c8d2e55c07781db37ddd33ec7180cde29c84f5020f2ba0fbf6aa83f9db32723e191c15df765f965d1314a57d12d80e73d20deaab1333afca65bdfac7 SHA512 6fb700d5d17c084fa520b29f3012ac565eaf891705a27c7738a61bb9899bc952f679987ef3790875b5a7adae836c602b394c7e19103f30bbdf5ec82cf3e86567
 DIST rust-1.55.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 5ccf03518eae6406ff66bff108b26988a6a859e5cf88ca44327f9826d880ea26d6e115fb3e63f6a40d1cb15adc25d6f1c056438466095b7223269fb0d74540fe SHA512 8d84a976d9922d28a5ddac0f47258759a4c7542df02fb9ffede4a3e98ceecc6415229f3eb676a22536ffff842c6e7ee35d50d1507f2d818301493ee3a7db9bb5
+DIST rust-1.56.0-aarch64-unknown-linux-gnu.tar.xz 223490136 BLAKE2B 29085e44fbc7337a11d396e452e53c43c0ea2ef53d2bfd6e294c837f890ce4400e9274705764ab40680226010ab502798131b1d717d7a4a1cc590313ec65f8d2 SHA512 858a28c6d74848bed5e731cd785995b095b78375d6b10834b2cca97778d571a9bed2bc2104a924d099297eebe91f9e829d7558acba0a46b31d7cfffad520bc44
+DIST rust-1.56.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7b6bd9c532801b1759524007ea1aa7037303a94cc0571cc3265f4be867d4f69d5a3c732598db01c43716ceaa19717c418ca7d5df6ca030ef014618b849cf72e4 SHA512 d8d05fc573f93a7063bbe54a6785305171b096b8348a44b0e72753a5500d97cd1b903394c0e8fea601e33892592cda6dc667285bb095e4d4fe0c4fff8cf12b46
+DIST rust-1.56.0-aarch64-unknown-linux-musl.tar.xz 219878296 BLAKE2B 5f7b0670820f2ecf8499c47d5731ec371234be923dad2abd261cbb4cb6da39d27a813d7ceaef22aa75f9ffce3067500e6f02c157a517951a0377073847919a6b SHA512 9a1445794558352005921c92d64a454b3270a1052dbd6dc1ff5e407057403b232dea5183920459fd2c9a6f22423c28af60b427c2edcd3f19565e036f918570fa
+DIST rust-1.56.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B fbab4bc200ec56df82cceb8511d5e11c94a64cf2202eac7fd9eb32857ef4f7acd441482ebaea24fa04d4df6709f14852d937b6b62e500609f678044507f3ce68 SHA512 796365d5bbff1f39b46df8353a0ce282c368e649569a202c50e13e1bdf8e280630d38630a752f18dc8da545561675fd5112cefac207cd98adfaf556029514d5d
+DIST rust-1.56.0-arm-unknown-linux-gnueabi.tar.xz 202166060 BLAKE2B 1e73ce9ad86bc9f4f7a920a822829ce12c991e763f09cfdf16d1118ca16ba8f8ef217232eae303fdcfa0eccf5b913b80f771d8236a2fc0bcefa9c9e30f5cb92e SHA512 31ba5c7a8aca7f42789b606775145ef776d03a5b06c46e4336aabdd38f92633e2bc206ad74c28676c52387dd979acf742f56ea49c3de8bab868c98f18242e8b9
+DIST rust-1.56.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B ee433953b9fc732f1e8606b4070d379dfe373b94b702316f10ae5d0802baa7bd6ed19d01c6a4eeb206066a6cfbab7329f76c175c7b76023adacef030ad666f80 SHA512 d64bc0635f9d87323cbce77dfa779a3d360df76ca161cd4b175e5aa63e2a4cfe1c8609b38d678d7ef8bccc011326bc4851dd81b55836223ff84fb85e29cc6364
+DIST rust-1.56.0-arm-unknown-linux-gnueabihf.tar.xz 198940944 BLAKE2B 651932afcf232292611b20ca43a034e2b54060a15b6c4bf0c37c40b2864e59d9ef3ad865cc6a0729b02de34abe23a09e758029860d3d196080fef43268fd2546 SHA512 6e5edb3df13fcd0b4501e78ae55d2b62bca2c696e938f3e913cd15dd1e3fa802bbc813fbe5696cf5bfecf1e9fed99e6c83b23be423a467b084f6f66cf08646cb
+DIST rust-1.56.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 94363ce80bc31d867583484eab662c3a3012019c9e90205959b71df6a8893a92524673246e1c1831b3a228fc75233184bdcea13cb28ed1dafb3b8a0764fc8161 SHA512 2eff4a8d702c88a1e283139a9a435d845a1ba30fd2f2857f8c19c0d19fc94698ad6b6ac87be0b1d3ca4a78a6ad658bc57357c9c84e8983505dc29d080a4041f1
+DIST rust-1.56.0-armv7-unknown-linux-gnueabihf.tar.xz 204645860 BLAKE2B 4d1bcbb704954aa09fe89d0e2d15e886dc5e25c91c24a2239caeae228ebeb94fa40ccd7bacdf67a3b9ecb5aa0cb5b1d54306642d879591675380496142699acc SHA512 952edc69bd1747bcb711ea81c58c580b8b2128722edf851cb0a20e6b85674e9bba0e234e6eacd5e3052480a72d896f2792f1a281ed8e99b23dfe1c51b467e3dd
+DIST rust-1.56.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B be71c4cc8ee6e64e8850cf4c95b6f34c115fc1bfb62890c7f1794a229656fc3be1b54321db1174e7804540ca307360c49d07e45e418bd0ce7e1b1db20bb83da8 SHA512 2e9b2d38beb4199062f87c40875622ea2d914023d0fae2cd631db5f04b423c868089084e8731c3260a180d2d5aed531714ddd3c383f06703cae720942c90ef6f
+DIST rust-1.56.0-i686-unknown-linux-gnu.tar.xz 215611688 BLAKE2B 759781d0e5771cf058eb47ef6f5aa2cf5bc2c692d71ddad6bccf37af62a587cb38f70d23c7ba2ba0bdc07635b6516d2ed63a99497bdd03433bdab16a611e46aa SHA512 6e19d19ec3aa00262c90e66a7be46805b36601f8e13ff3b026479c589965c6006d045c92bc56a063fb284e830220af1124a80df1a2e7850bdfe1cc0fdd149f3b
+DIST rust-1.56.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c416bfa472174a38631022988de8b6294585a797b764766a9547564e5099f9fe24d46f27d734eb81c82156ccd135fd60c97aa9e13f69dc2a84b9a8554407ebaa SHA512 04a040802634f42fd2d9ea62a26b89d10c44426eb7f00ea4532859903fa89c7dec6dbe37fc572b6986653fb862236ca0d48be87c6febc7983a670c452c145ac5
+DIST rust-1.56.0-mips-unknown-linux-gnu.tar.xz 160762656 BLAKE2B 74a98ca534020c1beea16ed0aae5d55087e52e80743ecb5d4e23861cfa3e39c9f3eb216c948095f76be25a5fe89c47f2e1c7354b5b4f56acdd3532ae3874ee49 SHA512 a6e33f557faa842f3c5fd49223216516c012d4af9b3c5efb3f53778a38f02138e1b522b98ec91bfe523f507ebc932f6966d329f23b36fad6a3d105d4020bce3b
+DIST rust-1.56.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B fd9cf1b07e64c4196e25c023dbd7b5dd9ecc346c3590f8dd4e5d3ed3b03b6b04da90a8549178eed0db0cee2acd5efa4be300da6907cdfa5424acc52ed047696b SHA512 a7278ed6ffa56025257c70e77f5dff3aabed699282e05b01f7f3eba8ca1a813f43f0ee07357518dde78df11fd3600cfd6dbc45757a20850694a0bdd2c079cd20
+DIST rust-1.56.0-mips64-unknown-linux-gnuabi64.tar.xz 165953860 BLAKE2B f02278555bbc3c8169bb4dff02383b8736fea8ca8dbf395aae5d62a10c0a9e25088d1d56b7d6b0fba6d4384f988f55d1d82153ec0038bbef0044fc8316cb7786 SHA512 fec707ddb8ee51700716ec6283f3ecdb910f7ddbd8ad4fef7882595afe5b55b1c8f862240172ed20cc8e07bc8db9682184fcc10ad58d2ef7e4eddb3e54a14dc3
+DIST rust-1.56.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B a1509f1799555bc84ba43eafff55c4e6e62821c3eef27280682210823cfafb627ec28d0b3faf1cf624f88c9bd2e83af1438b8659acdf3d33413d7e95a2271a53 SHA512 6a39541d53229f432090a1304797c1f2c2d203c72ee266a07e408907ed56a1dba15f644a074235dd56058f77bafeb27bde32087546db2a86b64a65bc7bbbd41d
+DIST rust-1.56.0-mipsel-unknown-linux-gnu.tar.xz 164590680 BLAKE2B a5c7c7e1ecb0a6cb079677b1a72c17fb0b141588a6003ec5ad01c54ecfc2d5e1f928246f978e7606b166e8a60c2defa375287931e04fb28da341037cd226040c SHA512 3b05f8f0e624e75608f94cb51be5c032b7ad56c9ee99220cac73a7f8f6c40cc35c3b5f846c2c930398eabdff2622c1d447720063b831006615c1ec4d2c25e01a
+DIST rust-1.56.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5ef21a9b209ec1b88df8cde1444bb5704656d3b435b1a4749ab65a13d0352392030c4ab4b59d71c2c03e554136c55fe44614b65d09fea644b7de572d357ccfdf SHA512 fd9efde43ae9d3427a56cab3128481733e0ee51d14365b8b5e65dbb5173bb11a564a4fdf68ad23ec443ab3371267399aba3ba704f3da41ded038a2d2ee898b46
+DIST rust-1.56.0-powerpc-unknown-linux-gnu.tar.xz 172592208 BLAKE2B 54016cd5f94e2fdba36329e5af7eb161de0485adc4f0e7b7933694bceffde8b101fc778880eb66156851f38cee66303b24095a6928f668d08bcba4277e2f6e92 SHA512 dd5e5a0f073c3de04a605cdfadb19538884ce1a715946e60fdc85408fa09a45d230eb3141ad999c5edb469a789151d5e6c7565743e162f7ce9add99021cb32ec
+DIST rust-1.56.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 56f2c613dcf42d969da0734f7c5d6d544d1a2883b4435e941c0779f9406c9b02a9eb8eeb4d8393cf7abc389ba2df78f05b78dad56848c24df1023971101a9a92 SHA512 a5a933921e9670b3b55a9ffb01d8eb5b7520a7e73bec987a161a7f37d07f9024266566a7059b47592e66f6c1926934ef2306b1e7283e88329e68a124255f07d5
+DIST rust-1.56.0-powerpc64-unknown-linux-gnu.tar.xz 186235644 BLAKE2B 13754e77299dd432adba0773586910a215a8916399ea827a6b5ab5d8866b731ec0af2a0772a8ef83ad897c491add7c513c4f3f06c41c61bd600f2ff742610b3e SHA512 1ad3c1b7da0cb4a697c8bbe8a0580a3a8f01e1a8e415b75ab4798f5425098855ca9c95ec636a36e796d919464f3ed3ca651e8d3811f3adb9b040976422fecaab
+DIST rust-1.56.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 62277bf7ee93ff6ad847cd9c69e89a2bd58f31efd235eafc7c4814c2e465ec24390c4a9fd99fc2c4c53fd994be159720b03ee169486f0c7af31da50b91cec2b0 SHA512 fab2896c285dd6641b5a7e6c8d1a9e96c084b65fe05cb519cc20abef7d5d42dfc0aaa2c61c137c89db26d0701fd4b32dee6453e98651f98b2d63ee34c8627dcd
+DIST rust-1.56.0-powerpc64le-unknown-linux-gnu.tar.xz 195350800 BLAKE2B 2ceeb04ae5a5482ee3908f07dc50e306426fac09aaab154c6235392ca9e403ed36f492dbf23b3f6172e964d2ce7360fc0d19f345ea39cc28874d812e21e22b8f SHA512 bcddee74d0c7c52e7ec17b4b808b0caca764bd6f4ce6235cceed5c93983673c768981cd8403b2a7cb993eb5055625af2679c8635955d4765acd871643eabb6b4
+DIST rust-1.56.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e4085f8f853cfd50e44b0bb8ca70a73fe2cb14827261aef40c98fe399ed2aaee9d29acaabe2d85d51d77ec1ccf6eeb263aba1042c4e06c2b0ff7539ace11368c SHA512 6d21afed2e7eebc11d1713774feb662abaf84d1ad524edd506efb0910654b84828017db6c07248156514a37c176dde48088cf387aebccf6476ecdbdfc961c0dd
+DIST rust-1.56.0-riscv64gc-unknown-linux-gnu.tar.xz 192792856 BLAKE2B 85af51b16ef1f749b1903cf98d4cb5d92d26bb17d5b5c2d493862feb8d21316a2d4aad73f3f9c8e2ef1436544a592d8a8378f3671c4c099b39e6e24f597bd4ba SHA512 ff9959be93e6d4049030d9e07fe6dc8be67fc635698ac37630b0cd8e1e446e6909879a4aaac4b0b08b93dcc2ce7650986d961ae1001fb683b235efc101b7e470
+DIST rust-1.56.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B da4e11a82df51283edc6066d5a54b1f2c5937e1f8a9e45ecc10d1509a7377c630a63c141b413123b01d6df67c0be6c63b0017bfae20b13c654d3a5de98981410 SHA512 2fa854448aa07f2c23bfc6145bab5973e73f0c444dbde8f0f823b6a843f2125773115fd91660906e7dbede25d44bee2ae3873d299ebf75a8123c618afd07fb4d
+DIST rust-1.56.0-s390x-unknown-linux-gnu.tar.xz 194222748 BLAKE2B 4cc8ac554f85ccf0963da9935da46d51640f37346fec2486fea50afabdd881c331c54af6ea15ef76a53d850dc9cbd8cfab8f4125b4749045d985393ead77b1b9 SHA512 8b00ed11f12604c377cafe7c206f8db10980a4c73bfe4b4d1d628ca6fcbb3df0553decd89a9ef775c06e62f446b817d4d51ed7b55bba5f1826e9d384fca7a26d
+DIST rust-1.56.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 443228e6dc0fcf1da9a33a89938710efef0881f835daa2af1b7593e32f90403992b752bcaa321d5241f233faee3773f205a9afa44f12b59978cc84c261b85ba6 SHA512 608a7062e93e7ada52fe9688f2efe1e3caa4d768f0e7be31cf47b8665a8dc550e9287d339da6712366cb68a14868e07e5b68c4a25b86c2bac1fe738f77815b3f
+DIST rust-1.56.0-x86_64-unknown-linux-gnu.tar.xz 147894784 BLAKE2B 6cbdb8a82aba4715d07c41497443a90cbe2bbed32ca95b3a8ca4bfd048334f1158b30f221bdec10bbef2d07344e8a35d4320ba8b991006263a6b764932cdc7e4 SHA512 bfc3a7493c208b35b42f40867286a6b3d97bda1c45983379d4223df31291e046a1214df1f88df2cb6558cafd8912cb8f0bab99a45899321b128e729ad03b9493
+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 rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
 DIST rustc-1.52.1-src.tar.xz.asc 801 BLAKE2B ea2f89289b4d9cf90a0d10148bf3494805c00e7822cc98addf0b602c35e4635bb1963d79168b395a5f7c7bd024070284fccd19757982daa0d554dcac166fd4d7 SHA512 0d692a085c017b03b8a135a28f7e6f1d7e05642d2e99f0f1fbc397e766bb8fed4b4c6b4c9157b79d9bb0c4229607dbc35711cd463c62a9966a4efb6f197de7d3
 DIST rustc-1.53.0-src.tar.xz 115686332 BLAKE2B fa068f89d42f927fdc79ee31aad1386eaf2aa596a060e059c5a1a73fe48c48d008fc952cd6c7912b743e41d77a94b205639eed0f728b2539b62f18a772cabfe3 SHA512 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
@@ -177,10 +210,13 @@ DIST rustc-1.56.0-src.tar.xz 121802340 BLAKE2B aa471fd0785d6ceb75d4b661d466a450c
 DIST rustc-1.56.0-src.tar.xz.asc 801 BLAKE2B 75bd829e457b6cefb2fcdfd04ef835487c295420d9d9c8fd7af800b405fe1113c14be01ad3540fea7ed7c743397e337ce1d3b0e757c73292d7f342f352e89791 SHA512 e81cf3d8b1c97803138d4487c32c1463526d53513112b4fa170a81ba947280613fb3260b43d0629a45c859519ea094e467ce0cc0def722577febc3cc34ce5ed8
 DIST rustc-1.56.1-src.tar.xz 121798264 BLAKE2B 09677b0332022f28a0d80949a6735929dbf64276f7eb57195d8c33e6c80f13c903432ff77d8834093ab551677618fb1d385f2300e2b1b4c064f9c245c696be32 SHA512 193468e211cde9ebc5f6e30b8e3733b79bd8710fe6dd45c7ed8d4392f91010d30466787afd4d0b2041cd7dd994924fee8ad111048824e248bd994959e55bf15f
 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
 EBUILD rust-1.52.1.ebuild 20495 BLAKE2B e22c6f77ae8cf31db3f0125f2203296ab0ca71591c841d8b6432eeaf7caa6b65971728458ada6d75102b0dc705f974caa20673b24e443c7dc3b6420706094611 SHA512 cb85e8792485644c713e3f51e3a42a03e08be437f04b976f7a17cc55c0b5be2c0a3f2aac46f8c1dedcbd989bfcbafc5cee10215a0b06bb68c1912eff052de5d3
 EBUILD rust-1.53.0.ebuild 20777 BLAKE2B 3f01634c94243453b6a46215e3beea8853aaabb84c0a24107db942c097a484c8344d023ee9758fa70defe2ed2717a2e5881e50434310498466fac87bf0ef0d50 SHA512 77f6059bbd1ede0b87a819d5439c3641576a91bed88a63cca97ce14242e3e8dc3e0eb39b1f1b0b6ddb060dc8a486d0f6b8240544f9ceb559290ce50f1149c85e
 EBUILD rust-1.54.0.ebuild 20781 BLAKE2B 0193014be971bb8b0f89aebd99babd687663cf53c83c8e5bad17abc1f63793f6344956d147de20bfa100f45306bb309ed1fa67b7493ee655b8c9fed42dbee077 SHA512 5a36d442b09340f9d348a4a05727aba447c80d989596bbd01abeee99da049347901b1514c32cf5a77cf0ce5189f9685c7c44019ef7aea2af7705720520fbce83
 EBUILD rust-1.55.0.ebuild 20688 BLAKE2B fc8d61fa97b433d12bad0e2fa8e9cd140834eed18f5a0624a0f8443a0f00917ec8911daaaf9e627a8377e7cfff9ca77a04def7b840ca61790b349dc209eb3d8b SHA512 574316e65953bed2c2f8ff7f36a58d95e82775a946778e9b1753fb4be272c0c4dcecbd589e4fd42aa6cb71e777a302579569229595e9c675cf483597098f6a7b
 EBUILD rust-1.56.0-r1.ebuild 20600 BLAKE2B 2f6b1bd36fa20ca5930145dbf40664d0e66df9d31eaab6f7356ff5755d9d8e1395e33289d8c22a1dd4c3ae2c5e3f0465be7c6e365b0405b08cdb1be89ac52266 SHA512 92d824b841d3e0604df8654db4ca829afb9594f1dcc33524f160689683b2a8d6e4b0d5c4517544e2a0354649a1834419bf0a2cd7468604eb1a9cfbdb52dea0da
 EBUILD rust-1.56.1.ebuild 20669 BLAKE2B b22727091688235399d1dc185500a9ce1c0476acec26418bf236e983d981664f381b1cd88fe4583155372b5377babc0c4c2f3196e216703cbe1e1fffefde8fc9 SHA512 af33a74ffcb6e7b171fc500adaefa508e70553c1632a8262546d939be52edf4a8eb804498fc36bd93018037f8d907759587b28a9df9f09a807fdfd17303b72be
+EBUILD rust-1.57.0.ebuild 20716 BLAKE2B 3d53eb626edd3828c6cbf5cc315864c852af7801b9e1a23fd9e146ffb25324941b722810b7a91d3f9e506bd5d49f1fd11c695c9f07fc157c703f952582469911 SHA512 ba57348bca2a21e6508f340c4047d57b9fa0f391f41ba71e74c29dd87282f0c037701ad9e38937f211881176ae90239e5311b1e9e74d3c5db7e2d0ca44674b9e
 MISC metadata.xml 1224 BLAKE2B 90bfe107b31b32d18f23514ff47013976e2b754860491f7e190d5023acfa93bc0eeee9456cd048bb4bdef4e40911d90cc14f831454c45cf550319c42c65b701d SHA512 6524001cbfb59c94e7fb7df5a995de327fc193d18353363c4a0126f6c78ef92866f995cf592923aabc7cb2caebc6728f95badcd5c8c777ad7bb60cbbe6b20f07
diff --git a/dev-lang/rust/files/1.57.0-selfbootstrap.patch b/dev-lang/rust/files/1.57.0-selfbootstrap.patch
new file mode 100644
index 000000000000..e30d0ee0e482
--- /dev/null
+++ b/dev-lang/rust/files/1.57.0-selfbootstrap.patch
@@ -0,0 +1,56 @@
+From aca8bcb48feca8c87b9af4e440835992d3f6d470 Mon Sep 17 00:00:00 2001
+From: Pietro Albini <pietro.albini@ferrous-systems.com>
+Date: Tue, 19 Oct 2021 09:29:19 +0200
+Subject: [PATCH] remove "field is never read" warning
+
+---
+ src/bootstrap/lib.rs              | 1 -
+ src/bootstrap/metadata.rs         | 3 +--
+ src/tools/bump-stage0/src/main.rs | 1 -
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 2d4e152789724..3b3c8a9227d95 100644
+--- a/src/bootstrap/lib.rs
++++ b/src/bootstrap/lib.rs
+@@ -277,7 +277,6 @@ pub struct Build {
+ struct Crate {
+     name: Interned<String>,
+     deps: HashSet<Interned<String>>,
+-    id: String,
+     path: PathBuf,
+ }
+ 
+diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs
+index a38391c7b88f2..65e229697dc87 100644
+--- a/src/bootstrap/metadata.rs
++++ b/src/bootstrap/metadata.rs
+@@ -14,7 +14,6 @@ struct Output {
+ 
+ #[derive(Deserialize)]
+ struct Package {
+-    id: String,
+     name: String,
+     source: Option<String>,
+     manifest_path: String,
+@@ -50,7 +49,7 @@ pub fn build(build: &mut Build) {
+                 .filter(|dep| dep.source.is_none())
+                 .map(|dep| INTERNER.intern_string(dep.name))
+                 .collect();
+-            build.crates.insert(name, Crate { name, id: package.id, deps, path });
++            build.crates.insert(name, Crate { name, deps, path });
+         }
+     }
+ }
+diff --git a/src/tools/bump-stage0/src/main.rs b/src/tools/bump-stage0/src/main.rs
+index 96d3c87384331..d6364e28fef97 100644
+--- a/src/tools/bump-stage0/src/main.rs
++++ b/src/tools/bump-stage0/src/main.rs
+@@ -196,7 +196,6 @@ struct ManifestPackage {
+ 
+ #[derive(Debug, serde::Deserialize)]
+ struct ManifestTargetPackage {
+-    available: bool,
+     url: Option<String>,
+     hash: Option<String>,
+     xz_url: Option<String>,
diff --git a/dev-lang/rust/rust-1.57.0.ebuild b/dev-lang/rust/rust-1.57.0.ebuild
new file mode 100644
index 000000000000..b5d7b0a91244
--- /dev/null
+++ b/dev-lang/rust/rust-1.57.0.ebuild
@@ -0,0 +1,687 @@
+# Copyright 1999-2021 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-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? ( app-crypt/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 warnings
+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
+"
+
+# 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
+	"${FILESDIR}"/1.57.0-selfbootstrap.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}]
+			cc = "$(tc-getBUILD_CC)"
+			cxx = "$(tc-getBUILD_CXX)"
+			linker = "$(tc-getCC)"
+			ar = "$(tc-getAR)"
+		_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}]
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ar = "${cross_toolchain}-ar"
+		_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 258143fb532e..04259c1b2ed7 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 67a14ebc3009..ce43d6b602fa 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,5 +1,5 @@
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
 DIST gc-8.0.6.tar.gz 1168660 BLAKE2B c23cb10db54db0e8b16c429e039791086dfec4216ad65fabf072bc0f05df66364d019fccf945bffc32ce12868edfbaf6d9482acb2949d1e233bd89925ab55ebd SHA512 2ea25003d585118e3ac0e12be9240e8195db511c6e94949f20453dc3cb771380bd5b956c04243b2a8ce31508587aa32de4f0f10a813577e6dbe8367688b7614e
 EBUILD boehm-gc-8.0.4.ebuild 1417 BLAKE2B 0a0d40849a901b436928f336c1e897ad6731317767d396aa0b606db1f8c1f21ab4a28e3e9730b5bda2772547903df19950fbbb228e688892b0475664af14d70a SHA512 2fbab201dcbc7eb60c4331f512a1c44947a5be15e70ef5de535cf2571a8bbb64f4a1aa571bcb08c8c2bb8c84eec336b8f01ef1320e08d303d4bcca724e2d3116
-EBUILD boehm-gc-8.0.6.ebuild 1417 BLAKE2B 41fa57a48d3f0403df38ada32d52260b6f8132b3257f652dd36e89fbc3e15a2b31edb9a61715d3ce9f238e708b9df21bb29f6a5b4e857ffc481eaca13cf33f7b SHA512 ab70aba367e7ba1f7b38f8eb711998ab60eca5b004fef60dc9b395e7a4469193effd77b3d69eb2ce63685f074700f3b4739999607c9713f620ccc2fc7d1f3498
+EBUILD boehm-gc-8.0.6.ebuild 1416 BLAKE2B 5a51b4301f306eb8a51ea2bcc95fc0a27848d1bbac1a23d0778cb481690467fdee39fe2145206d214863d4d772d8d5e8cf2450a406b2541d28235b5b5b634ad8 SHA512 234e4eaa0879e7c9e601fa170c6186d48c9cbb22739a8efb5a5958d83cf49fac6a04c27629e16e8f7157e024ebb6f64963185d08c865ecb1f82ef5c2a7dcf2eb
 MISC metadata.xml 366 BLAKE2B 29c98f78f2dbe359f1210fb58bd24365791b393cd4bda563185cea4fd35633e0affc82ef00e1e933a1fca0893054d81dd2e1a0c32c861b3cd496766d9decfbe7 SHA512 949dcd60bcde0641526151369de2195e7f784e30e7652087c58f30f3dce1646f619a0c31a0ffdbfa4dc1053d10d713e7e49050c1cf61a7fb8ecb40b479357eb6
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
index 592f9ffa341d..5bed412264f5 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx +large static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 88cb0272652f..2f247e8eefc9 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -11,5 +11,5 @@ DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f0408328
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B 90d0fdd0d832da9f503999914fec8c8d6c49aeee20ac7bab0d943eaa42ce518fb9193da12877304693d55a2bddc62605ad40c7a61b92a202737b43b751f7e590 SHA512 1910cdf860922e7794ccf2a7a7afe316c96e2ae2a2b4b0ee2f87571ac3b44202aab7d328006f962d5ad970bd295bb0b387d2969578e7f14c23a123a9817256cb
-EBUILD boost-1.77.0-r4.ebuild 10841 BLAKE2B be67ce28dd04bc9e41f07519b7750bbd65bd1e6830bf50619fce6e41446a726ace6918e934832d1bb9db986618f2f0a6a08d2aabf07211377ec85def41a3dc98 SHA512 e2bdd9d39901c9bab8b16227e85e10afe0a1d906ae1b388d2b6ed42674d80838b243ec2b9fb1ef806d18b07a563a499cfdda2402247ef4714bc53261a70cd5db
+EBUILD boost-1.77.0-r4.ebuild 10891 BLAKE2B fce56456f1ae6b23af5836ee5a1e7ee6a3a8bad63fece1f4b18d8188f289a7df758de128059a734a09512262c52d994526a5992eddaf341e7c2b831a361a1c80 SHA512 825bcafe7fc201600d46fbf10355577bee3cce3e7a9ba2e542af1c4e75c99167197d6521adedf7f73320b72f5e7a3b93c55b299cca47c10e48ff0d49a2a05423
 MISC metadata.xml 1399 BLAKE2B 118d73d46a29003761ee30d2166e747d192010c47bda8b13448dc3b775ec40e47c51a234fe6eb0994387ce01b5bbe9e5fb1aaedccbf09674e654952400a85b03 SHA512 a82bd9de9e47c55ff4b131549d693443b6ea1986c74afa1a6b2eb2ae7885e5438db60b4c2f5620463b78b8e461942647070729ffc92fcda7fe4a9d0e8c8def66
diff --git a/dev-libs/boost/boost-1.77.0-r4.ebuild b/dev-libs/boost/boost-1.77.0-r4.ebuild
index cebd955d5882..5ec5337f1703 100644
--- a/dev-libs/boost/boost-1.77.0-r4.ebuild
+++ b/dev-libs/boost/boost-1.77.0-r4.ebuild
@@ -91,7 +91,7 @@ create_user-config.jam() {
 	fi
 
 	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
 		${mpi_configuration}
 	__EOF__
 
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 0fe89039c568..c590e3c77cc3 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
 DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
 EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
-EBUILD girara-0.3.6.ebuild 965 BLAKE2B 2a7bde8b3ac5614c8945b7150f69d40eb95b8750f1218afd97720b587f0413d299add00d73aa8def666b1f7eb581abf58b90db2acf9cb472d5074481219bdda6 SHA512 558bd865f364584b925fedc2c57c167ba9a4d73b071e831a33ff82389eada11cde216a559efde764f423a738d7a91367dca98714baf64fba0e1101d44469e892
+EBUILD girara-0.3.6.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
 EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
 MISC metadata.xml 582 BLAKE2B 2ec3bae683d84fb4fd9fbf5114606ac1191df2ca8ac2fdf46b5b4da32999342af02881c67b96df28b39499bed88db1a6512922df437b2a3335fdf62ee56a57bd SHA512 86df21ee24a4f91bbe8329b197ebe7b327ffaa1949c66d7cea4a3cb955aeafa122192c2d2178234b014d5e3824a041641243ebc9869a789d5238942fd6c200cf
diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild
index 9aea48ae061c..67aab558816f 100644
--- a/dev-libs/girara/girara-0.3.6.ebuild
+++ b/dev-libs/girara/girara-0.3.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~riscv x86"
+	KEYWORDS="amd64 arm ~riscv x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 1509ee2ead94..8d5736b48a86 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,3 +1,3 @@
 DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
-EBUILD libmanette-0.2.6.ebuild 999 BLAKE2B a577bd8cb1162c5e663a0e360ea352f24eb5053383a2b751ea63081e9f7a9d6e8cde3ee745597828b24d5b872ce0c0098da07a92631dcf8be22a1708b2d3a1ff SHA512 dd24cdb7b84347966c4df545ad3b38e46f67d69d41f94b7842ba344e6d4f86ec23c09a8147ee78a790a084d181e11a912823e746e350623de64d01572ab87786
+EBUILD libmanette-0.2.6.ebuild 998 BLAKE2B f2d31459add4ca57e40b9345c8e7e6ffcf63caaf7f2b0ae2ec2a02e46a5fd831422dd9132d09c52e20e2f2697cdcb388e388fd8a7a2ca68c635192572bf3821e SHA512 1af5a8ac658d23ba6c7d0adfd53322225ac492e26b97e11085b8b2fb1fa8047ce794ee4a09ea06fd4a5bb1547f12502ebdb07614508c4d9add369dcf6f007754
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index e87160249bbd..cdf714b17c27 100644
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="gtk-doc +introspection +udev +vala test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libphonenumber/Manifest b/dev-libs/libphonenumber/Manifest
index 2c773467ee92..0a47d1b1c77e 100644
--- a/dev-libs/libphonenumber/Manifest
+++ b/dev-libs/libphonenumber/Manifest
@@ -1,5 +1,5 @@
 AUX libphonenumber-8.12.37-cmake.patch 1963 BLAKE2B 4ca131a59bb4a5558b01eb1428cf9be4e8c006c85235800f09689960c7c489a4da52d044eb0b11b40172bc37382545f46872f35571b0f349a9749ce21237da64 SHA512 feb365105ad3aa6437b495e0ea86d8050bed06444adb6ce79628186f3d8a5cc67f496b1a73ee8bee049d12e6e108921d76cdfd2d0d1a9095b4d5bc0acf5d2deb
 AUX libphonenumber-8.12.37-testing.patch 3349 BLAKE2B 1c96a9efd1919c04ed86ad63713e89ea8a6a21139faaa0b4cff406f0d168c57b981b0af1aedf54e54ed753cfa1c8ea815e78fde86c578c9151bdb5d98e6b4ad2 SHA512 00ed243396507f1d7448faed83f82009de7be1418b499f560b0961ea9796bfe7285d9c04c43dc5f3cd8baa90314a487e377f4fba571c5b492e065a97056ce375
 DIST libphonenumber-8.12.37.tar.gz 11005274 BLAKE2B 2bcffe898ca7aa667a35e9a7340a54f880cdb9f290e807e9ff7f6ee778df83dd80023703595781a97355a43a8096bdc957a7f79336b5bf9d892ada26e35ae025 SHA512 420ea841679c1ff420289b3fea0bb6d86d4d1e99525fce00cc90025c8ade99e56e2dcbb7fca64190437ff0a889cdc7373f182e7699db20a072c32e984b8dff33
-EBUILD libphonenumber-8.12.37.ebuild 1138 BLAKE2B 4e251ed825d964f9a10ae6dde8cdf7060f94e84363d18d4e077e5fe2b888a1c730358a3c992ca9170d198d8e37d8f273b287205044428e08515ead53cd0dc85c SHA512 9ab9079d4ebe31ba07aeaef1c082450c500ef84437955f119f2e15091ea03dfa24c881319b9b7ffd690bc8b9428139bfffbdf3ffeaa4a8e289376511015376d6
+EBUILD libphonenumber-8.12.37.ebuild 1145 BLAKE2B f341fe21af49556993dd6f6671a069d95416418468afdf215a2ba972e8512f85fdd3b983e21485e7abcad605254db325749407075a34d0fe6d507a24ebd1e57a SHA512 3bf561b06fabaa534a9c4951d1e29b9ba7844fff4d95ab1fd91c69686fc97528fb0735dc333e07544300b63b044d9db04c2169b1d68c67eaaf1ce780dc5a7289
 MISC metadata.xml 417 BLAKE2B 95de59ae08b1ea02b4e31e2db29ed6e17040d243c0254ae64eaa0c1a4195244063714ebe9f29e0979a9f6be728eecdf47f8bfac77f674128fc37f52eaf8c8896 SHA512 6fc39161d18efec9984fac508c586a579d93ae12a3cd3d4671630af04d8c86db1b86a5f43ac421fa7c0a4b38f7e333676fc36c8066fe08ebe2a92e56f1acb882
diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
index ca29ba7d46e6..7c05c7eadaa8 100644
--- a/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
+++ b/dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
@@ -13,7 +13,7 @@ CMAKE_USE_DIR="${WORKDIR}"/${P}/cpp
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64"
+KEYWORDS="amd64 arm64 ~ppc64"
 IUSE="test"
 
 RESTRICT="test !test? ( test )"
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 6d2045ef8c6b..dd7bcadde01d 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,5 +1,5 @@
 DIST libthreadar-1.3.2.tar.gz 442260 BLAKE2B 2a743fbcd8ae0b462910b7ccde34a3fcb90239df9bf608c9d249dd9bf100315ade3b2151339ae55b1121709446c23044c3fd7bb420efb009ae8d5fe0a21a496a SHA512 6edc3a1a6eb41a3b9ada35327d712fcf3562875dbddd0bd2f3f016492cb0f10fe669ed1ac3a65573d88261b4de50201b2abe8dcbffa0abc5cc257d7a8c3c4df2
 DIST libthreadar-1.3.5.tar.gz 443192 BLAKE2B d8e06c7b58636b51bd2ffd50f51a8a024780e4955693a28085296ccffeef8ad2866ac12e53b3c78b37a650c4b1c54b5fa8dcbacd1002577cdd7b30eccee2ef69 SHA512 c4c34036a7882d1ecdbc025e0d927b6712fb067aaeee8bae5bc740a5259c5f49d651a8ad6323ddf6cdf13fd2e5e7c396f9c134ef3447b3743ae8e64abd646850
 EBUILD libthreadar-1.3.2.ebuild 912 BLAKE2B 48391b40e27a540218552b5abd895476a1bdba0aec771bd6385f56ae90ce5bb97f0971a11bf4133f4e16072dd8faf83e3404a384cd77ad144074b1853f8bcab1 SHA512 e383c7048c93936ef171bd945fa658350a81aac641a00fefc06b13cafd5bfa48ec0b2c3e20ea035e858c1772ceb7fb27425150a55fef2d60256c2591c2faef98
-EBUILD libthreadar-1.3.5.ebuild 489 BLAKE2B 35fa6a85db583b8b98c977e2de0ce09ef9742429770c6bfa339332c33a544c42db80c1f0749fa2ae5442bff790ea5af3940bf100c3f3024409f13f0588d10a4f SHA512 53fa629ae4690a38fae0e69a3265c5c8ca3d27406feda8792940453dcc05cac3e91b36320738af9420ab139e508e68180fc902a9aa6300e39f6d7784ae132181
+EBUILD libthreadar-1.3.5.ebuild 487 BLAKE2B 82d3fabecec2c763e21f2296315270c01d554b47540afc6780cc47e336e2716a9d3495aa7aaf91a5adad33147a03465ea6930c4deb1cdee6f7222fbb6dc01afb SHA512 15584e850b6870de765c9598f175fb346ab55301c51e1d7fb3d92bd744e86ac3fe0bf26beb66f9a6b0a7b192692a6bff0fa795cf20167b84009279c3ca1bada9
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.3.5.ebuild b/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
index acbbf7fb71b0..36a691d5afa0 100644
--- a/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
+++ b/dev-libs/libthreadar/libthreadar-1.3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 src_install() {
 	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index c2bb40e5b612..72e435ea05e4 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,5 @@
 DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
 EBUILD libwacom-1.11.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
-EBUILD libwacom-1.12.ebuild 1366 BLAKE2B 79b35c83ab12b4fb6e8a1e3076b41d632a27c142896b4db41e9e97f765e3729ae6c35788c782e4a5c58d3b73c2512c259c31cb8051a857fb5661e8d3531a1c0b SHA512 86ba4d62bbc860428b30f4ff59b10dad47f8a6c0ceecfda0ecee3674769887ad7101ed3fa24e0ccedbe44f12ffb7dc1019ab9ae4a010960a27f17942ddccc75d
+EBUILD libwacom-1.12.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-1.12.ebuild b/dev-libs/libwacom/libwacom-1.12.ebuild
index 75d6b5e301f9..acfda32d8405 100644
--- a/dev-libs/libwacom/libwacom-1.12.ebuild
+++ b/dev-libs/libwacom/libwacom-1.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/vc-intrinsics/Manifest b/dev-libs/vc-intrinsics/Manifest
deleted file mode 100644
index d3d8a9f1db20..000000000000
--- a/dev-libs/vc-intrinsics/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX vc-intrinsics-0_p20200904-cmake_libdir.patch 717 BLAKE2B 7c3d72b87b0acc67c223a3468e96ce68c5c1a166bccacc045d73e5d29a063856b23ba959ff1e13d07333d20803cedfa3f55f490ee9ee7700c708876de1960f71 SHA512 927c89f748fa21d3ef9349749c3428014b055a88d557dfd310f2b76c7f9e263400267558a83871ab132c295a997dc0488b9df2167378b9c1dc691469e1554f4c
-DIST vc-intrinsics-0_p20200904.tar.gz 97118 BLAKE2B 7f1a4f0b3b5f8abba8972668877562fbc6835ce8cfa9e0b336541ee6db72ff1469917320b63dee7d193af89593bb318c9fcd000ba5e8d62df5729f69cfdcb9c7 SHA512 7b5f87dabcf1c093c50721390dba9c82a1f0da1a087d00af4bf1c2e080bffa531b8d16fe8faacfaeb4862b528929865263d0e84a5ebee6a76eef1436dc4e2ec9
-EBUILD vc-intrinsics-0_p20200904.ebuild 1355 BLAKE2B e4ebb93f1eb3b500027788d4dbb6d089411af2a443579ee60096b33a5e0421e3673a4503b435a452549077de2c309d18718fbd94f26ee3be4e4604c617456325 SHA512 836b14997f421581e21b2af7bb8a4866392f000610e09d792adefe85077f416fd5b3a40934f7a57e85bc1c0ebb555d6ec1f43e36be87e7a5ee9ba7936fbf2ee9
-MISC metadata.xml 252 BLAKE2B 7b5981bd52cd8ec77b7e785229806f8a82d675c2fdfaf15d63274a32a72acfd37368546fa342c5321b7e3dac0dbecc9a30cdd7eb6433aa577898dff2e8cff6fa SHA512 ce753136e00910efe1d50ec5bd6e4834b9af5495e6a5aff3cff0d073ec7495f2ef65bddb5702ee0a1a00395e65340c50c800568e0892498e35aef76dbb6b1e32
diff --git a/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch b/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch
deleted file mode 100644
index 694cb1e28562..000000000000
--- a/dev-libs/vc-intrinsics/files/vc-intrinsics-0_p20200904-cmake_libdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/GenXIntrinsics/CMakeLists.txt
-+++ b/GenXIntrinsics/CMakeLists.txt
-@@ -52,15 +52,15 @@
-   # we need to limit it to external build
-   if(BUILD_EXTERNAL)
-     install(TARGETS LLVMGenXIntrinsics EXPORT LLVMGenXIntrinsicsTargets
--      LIBRARY DESTINATION lib
--      ARCHIVE DESTINATION lib
-+      LIBRARY DESTINATION ${TARGET_LIBDIR}
-+      ARCHIVE DESTINATION ${TARGET_LIBDIR}
-       RUNTIME DESTINATION bin
-       INCLUDES DESTINATION include
-     )
- 
-     install(EXPORT LLVMGenXIntrinsicsTargets
-       FILE LLVMGenXIntrinsicsConfig.cmake
--      DESTINATION lib/cmake/LLVMGenXIntrinsics
-+      DESTINATION ${TARGET_LIBDIR}/cmake/LLVMGenXIntrinsics
-     )
-   endif() # BUILD_EXTERNAL
- endif() # INSTALL_REQUIRED
diff --git a/dev-libs/vc-intrinsics/metadata.xml b/dev-libs/vc-intrinsics/metadata.xml
deleted file mode 100644
index f239bbef222d..000000000000
--- a/dev-libs/vc-intrinsics/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">intel/vc-intrinsics</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild b/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
deleted file mode 100644
index 7ecd07659322..000000000000
--- a/dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib llvm python-any-r1
-
-MY_PV="830067832d4af0fbd5710e9a45669a02fcfb7c3f"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="LLVM intrinsics representing SIMD semantics of a program targeting GPU"
-HOMEPAGE="https://github.com/intel/vc-intrinsics"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="10"
-KEYWORDS="~amd64"
-IUSE="test"
-
-LLVM_MAX_SLOT=10
-
-COMMON="sys-devel/llvm:10=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="${PYTHON_DEPS}
-	test? ( dev-python/lit )"
-
-RESTRICT="!test? ( test )"
-
-DOCS=( Readme.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p20200904-cmake_libdir.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/$(get_libdir)/cmake/llvm
-		-DTARGET_LIBDIR=$(get_libdir)
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DVC_INTR_ENABLE_LIT_TESTS=ON
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}"/usr/bin/lit
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# These tests only work on native builds
-	if multilib_is_native_abi; then
-		cmake_build check-vc-intrinsics
-	fi
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f0a968ca934e..bf75a571fc86 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/fix/Manifest b/dev-ml/fix/Manifest
new file mode 100644
index 000000000000..369665690fba
--- /dev/null
+++ b/dev-ml/fix/Manifest
@@ -0,0 +1,3 @@
+DIST fix-20211125.tar.gz 383709 BLAKE2B f74b41e10579423449ec4c78ddc2d58d94c0ba96fe46676979c8f8e31c49a4ab2b305f78082785c52ff3665f19162b14c849b80ba0d09819e327ce7f390ff2d2 SHA512 2ffd3bea841247adeaf8d9ba3cf76669f31dcca97a2ebd415ca3b4540cf273c95f6a0e8bc990aed36dd097b09cf0603c676127ca4141f281f1ae8bb343d90d5f
+EBUILD fix-20211125.ebuild 437 BLAKE2B 40d9660055c43555c2fa2078d62d92a4104b8a14df12cf61a4870be87eac58e1b9419e48e71d90e558ff5a33f53b3e27559d00fc773aa34bffff5a7199885bd5 SHA512 9827863c70e2f1ca1697910452ead7ca12b3f1e9032c15b4558049df3963a3078b098dcfd8e662b269ab68489dfdb1e7959fbe05c90e1191fdd80db9a60bb4ce
+MISC metadata.xml 336 BLAKE2B d846dc519387396575449c27ea9e8d69d1a8c86d049c235a6dec571babdbdf3c528b2d8fe6cb431ab6cedc91d92b4c2c3937f2005a60609138a7be726b49ae33 SHA512 e76df4523b542f2cd71387adf61c67a871393d562548f0c28a7add52be627dbab53530993233da405a5ec6ec61756d726127d0dd9bebfb3f448c1058769f89c3
diff --git a/dev-ml/fix/fix-20211125.ebuild b/dev-ml/fix/fix-20211125.ebuild
new file mode 100644
index 000000000000..9117c4de5fdd
--- /dev/null
+++ b/dev-ml/fix/fix-20211125.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Facilities for memoization and fixed points"
+HOMEPAGE="https://gitlab.inria.fr/fpottier/fix"
+SRC_URI="https://gitlab.inria.fr/fpottier/fix/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # regenerate & qcheck not yet packaged
diff --git a/dev-ml/fix/metadata.xml b/dev-ml/fix/metadata.xml
new file mode 100644
index 000000000000..1e1b31b6d744
--- /dev/null
+++ b/dev-ml/fix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.inria.fr/fpottier/fix/-/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index 5dd4ecfbe226..35960df604cf 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,5 +1,5 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
 DIST merlin-extend-0.6.tar.gz 8098 BLAKE2B c8adb32c03a3fe423aa1bb9e10ed9d5041cfbbdc991ae656180debbcad6ee72404bdd7c03d8ee609b809aa27e8013f14785204c759221e33405182ef6c9d1616 SHA512 5cfe4bb1fe8804dcb52eb4cebea6176b5d50fdafbdcd4f5854726c74f196ad06fe3b1b46dde7622f2e5c99ce6bfea9efd070fb81e5fd5e2b5197f40cee109ea7
 EBUILD merlin-extend-0.3-r1.ebuild 468 BLAKE2B 4c2a223fab1b140888113d1a8bfcf08993f8d2d83706fd9ad6dfba63371d7e5783f983f5698b2a08324a5bc5f2ec602338ae8489066c74bd9dacb17f6e3e8b87 SHA512 3abe591dfb6460a42815ba8a04a44ff8078515efb36518d7067ea644aca99457953aa896e1b748f364a78056b157b773e56c513dafc11f7ccc7c586e29f090b9
-EBUILD merlin-extend-0.6.ebuild 463 BLAKE2B 5eea33928354fca00a371511af2d0316a176b78944cb476e833c41281d4ca83036e28720b50b97ee98dd03aeb758854c347ed6ec5314b4ff3326d249bb6f3574 SHA512 8f59bf539f5d1dab272bdf40013dad07fd521409f5f4d44ace2407ae5de1f662980315e26480bf276681b900c2eda6a5c96d76c8de092f63faf7037ec111fe42
+EBUILD merlin-extend-0.6-r1.ebuild 427 BLAKE2B 813c85cfdd3d7469a7670ca176bc448d38665f6727caab324c1475c67f242d636c7165a77eb37adf7080ef3255a2b55ebf6db4fa92be9d1cf323955e52899661 SHA512 11261251cf86636b9379281060fc4d1763532b18f4db44a2245d29ee7c2ed1432a668379fecc5ff862c9de2295906e40e4fca68ad1288d0f4c695eab888ee15a
 MISC metadata.xml 319 BLAKE2B 1a5504443802ca145e62b7a0a93d0db800a0723d8ccb18945d407d43f45b1631b9887d83a66062fba544fe3822b6193c0709615380baff74d2be0d60e764409d SHA512 cd5db8c1f6db80a9179cfb785c9405825285846a1bf307dea9a8bc4b1a3e21d7008ad7be8acf827abf7458690b20a41731fb3ec0a10a31350dbdb8dbd3427118
diff --git a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild b/dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild
similarity index 85%
rename from dev-ml/merlin-extend/merlin-extend-0.6.ebuild
rename to dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild
index 8643e7059fd7..6f8142a989dd 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.6.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit findlib
+inherit dune
 
 DESCRIPTION="SDK to extend Merlin"
 HOMEPAGE="https://github.com/let-def/merlin-extend"
@@ -12,12 +12,8 @@ SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
+IUSE="ocamlopt"
 
 RDEPEND="dev-lang/ocaml:="
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
-
-src_install() {
-	findlib_src_preinst
-	default
-}
diff --git a/dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild
index 17ee0c56851c..7f82d873b120 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="minimal zip"
 
 # No, pkgconfig is not suspect, it actually uses it at runtime, and this module
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index 9042c1eaa1ac..d22bd6a699ad 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -1,5 +1,5 @@
 DIST Alien-Build-2.38.tar.gz 331770 BLAKE2B 13a688073ad6840e04a2c2191ae5974048e53127bcd7f15bfd658ef8c047fd0ecd990bd2f787dca0bf02fde48cc451a39ad5e41bd737f4ac36a64aae49aca226 SHA512 a77b27894c74e9b73fd479f3efb67c748bf9f32931a75471f6e5e0ccbb65d2e5617abfef28f71a7e461f4e1a4216fa8968564aa8ae52ff1bbeae570743fbab81
 DIST Alien-Build-2.42.tar.gz 319048 BLAKE2B d4662f5a9e0bf151d389949cc696258fc8d96a0f2aa0f6bb014f1283207fdc92e8af994499a391439a8ba725d6a23a60ed33bc0701f4a2596cccf808c9c23ecf SHA512 83f30bc5f7e417c3ec4ddee463f24c73f89038feb3820520259fd33d4357007d7d39e14c3369e0d14f4b2f946606bb3db02111c2c497e93a961f7a3161af5366
 EBUILD Alien-Build-2.380.0.ebuild 1316 BLAKE2B da956aa2e5fae70135869be14b477abd88a0a27d7fdce105869977036f496324342c187bec8168adcd82ad42ea9347ac60ddb47638a0dd275dea350353bae52f SHA512 3d1239e3f12da866807e0c8dd848707babae7e61be6458def7843b30d7a6c556779b985b4c15abad94e7ae1365942ee69406e83270797271ff223a54890d79bc
-EBUILD Alien-Build-2.420.0.ebuild 1245 BLAKE2B 9640404ec4f66a4a8bab6f4b09d7214a6161052da184966e189ea446b40315069be76284590b380f200e39867c023a39c3df6882379260162acad5cb74f97d11 SHA512 4edb6f4d6c6579fd3ccf3ee83bd5d180a6e63247087f1bf0d92bb2a37ff2db6d41d2e808bd29cd254178eefaf33a060a8874156a1f35f3af774f03f05de25a4e
+EBUILD Alien-Build-2.420.0.ebuild 1244 BLAKE2B 2cf31753fe1071d7db6fe27c2062e9a9e12ab3fb4cadbee4dcb849cf221354ac83a47f9838cddccbf3a4b54cc76ce736b71d3b4e63ced534c9eb7f40b1a9c4cd SHA512 c8cb77edb8a652b155359f7b23b77db7a50cd8cf27b62830518ee54741f33835f1a1b6a4bd0d3fe2e96e5fadcf934375c6bd4d1e4e0dd8f4cfe4463b4937a631
 MISC metadata.xml 6071 BLAKE2B 1b4234bdc465faa73b6e0005723167f09d358c426013b312abf12949d2392929d5e80c44c1e6a8883c5633ed841a0f8b4f5977a9354b789153f559ecd8d4a4a2 SHA512 b5f6e6c37a9b7b8f362e53a622c2e80c8af32189495a74e8d199dcd7e6fc77720c5cbd481d8eb8233c943a6b817475b0d91b784b5474bb358fd91ca4424a82ef
diff --git a/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild b/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
index b05eed1464ca..84087b089a63 100644
--- a/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
+++ b/dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic archive extracting mechanism"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	virtual/perl-File-Path
diff --git a/dev-perl/Archive-Extract/Manifest b/dev-perl/Archive-Extract/Manifest
index cdb507e1c19a..cdc561d7061d 100644
--- a/dev-perl/Archive-Extract/Manifest
+++ b/dev-perl/Archive-Extract/Manifest
@@ -1,5 +1,5 @@
 DIST Archive-Extract-0.86.tar.gz 28033 BLAKE2B 0a2f6551d31d43256405379c980e5f671e4a9b168050a0b08b8ecc2d076b5f3cdc49075f1001646a3d2c0b9eb60aefd79aeb11997f2de3766cd9b23839bbdac7 SHA512 a091b8c489275b8dd3d38e52e983bef7cab7d642e0dc8f6e95f1d8d006d769857b4e5950778bddd3044d6f11b3563c7796361e88869f60a9875529b78c9d1c76
 DIST Archive-Extract-0.88.tar.gz 28294 BLAKE2B 59c19013c486c0c691d7436ca70805275b448b4725ee955f4b1f4fd37fbf46b5d80a38c3406f0bedba7f1a2c7c56f1f84d02df7d5bef1f5b7d4868eb70557a6b SHA512 6fcb6a49e59fac5340663e5d906978af390f4ba66da6c4f02e6b2db666da68440af59ec93a687d13316089b07237b2213df55d8ebb940c4fa9eadd09d1bacc86
 EBUILD Archive-Extract-0.860.0.ebuild 698 BLAKE2B 7702f402551907ada3672080768d161533c1925b6d9660de9bac199ccfb51abb676c72daecf64c5070ea3b850fb74e5f8308f12a39ff036e166c331cce3d2e42 SHA512 ae2908ea7f7ef5fa270abed0bc351c4753b8b8d8b55866c6fb2e91b2faa490b54844ec1e60e0f582ccded19fd6a10a216451ffbe9bb819459be5dfb7ff5cd34b
-EBUILD Archive-Extract-0.880.0.ebuild 661 BLAKE2B 4a70a318f3b64f634dbe4bc713f43bd0973ecbbcdc6efd9920f861ee23b41f46f17bdcc5609d9d0396bc465767f5fbac8046fc25f9d1ff8e0968388868eb22fe SHA512 a3d816c5a9fb415a1f3eceb86ebb0e3171ea7e28a384d75a9dae45a5cdca284e839f927a29e4ed9d012d2adab41d833655c80878860937a4e35ef6f9c19b6f61
+EBUILD Archive-Extract-0.880.0.ebuild 660 BLAKE2B ae7b6c02f88409185e0b335e428f529774ef1f886ba06bbf79fb9115734ddbd566998af0e78dde6d7cd7736a3626491ebb060aed6d10a1ac286467a19fa8357f SHA512 e71263ba3b81d2a63c95423a0630fe205858b4484f210541295ca7937b4c519a52bab0b6a68c1dd00d63c71a5c2b7f8e11ef53f2196bcec8967d853d3b843f65
 MISC metadata.xml 403 BLAKE2B 252ca6445d3a5ee3b87c185860f3225b8155f1abb70234c42d5157f13c79fc77d6211aa21d54afc81e1a756b2206c6f81b31efc55229ea0095d9f3b7bdda2ad3 SHA512 77270fdc98059e4e58a8016efdc34e4cd6b3b63bb89a4c17eabcc27b74cc1dee965d8f47274f8b490adceb5e9e7ba48d18167d416125b467039c4281f14f56f5
diff --git a/dev-perl/CGI/CGI-4.530.0.ebuild b/dev-perl/CGI/CGI-4.530.0.ebuild
index 8bfaddbf7e6c..4cbfb41fee2b 100644
--- a/dev-perl/CGI/CGI-4.530.0.ebuild
+++ b/dev-perl/CGI/CGI-4.530.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Simple Common Gateway Interface Class"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index 2a3119b9c05d..10c872365c7b 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -1,5 +1,5 @@
 DIST CGI-4.51.tar.gz 205366 BLAKE2B 1fd76c82610ad1b017f19bd055bbf4a533f96e385891c53832a7e43f4c8d5fc74ed81a6e86e4e44443ce666bf30a7354b06f808d2c68e65c0fea75b2ce5fb7b8 SHA512 1ff69bf78c346142f0355e816fae18c69eb57504c2fc06738f2d26b97adee7cee1df2b4b2246ae72532e769a613aea6d6f7027956066a0c12354658e62a98e5d
 DIST CGI-4.53.tar.gz 205366 BLAKE2B 8ca6c79688233e09e988097c465bef646f49e2abd82709918406ebcf5da9d7d5b7765691842f44b52ddde694864e0adcaedf869de4750d033253b68ad5bc5982 SHA512 8b037d4c3240dd87ab888245b604efb43d25e155e3e7e4068b373ef73d7dc2d6361d83819733f62a5c138003290d5195ec8cfaa1a5e8ca6356e6e9aa52813567
 EBUILD CGI-4.510.0.ebuild 1000 BLAKE2B 29df1e62b7c7b1f3ea97d592d4b054c44b6327619000d696a955814c567376e7fbfc36148b5744e2caaa0ac5c693d218d1d78f2ca1728890f36167134944e48d SHA512 07d8defbcd8b74336eab1938b16f12ae3cd79da2958801a3aecb23e6d3528e647b3864aff45eaf2a9707bf58e59e2a3c63429bfd160f6a40d4f6bf2368a11d6f
-EBUILD CGI-4.530.0.ebuild 964 BLAKE2B c3d61eabbd96c4d4386682b5327665a43a85a520d8bff9affab4e3454bec8f4a332111358dd73beb8ce473b587ff535e3bc215de2d91fc32d9378e838ee4b266 SHA512 8a664194df003504ec0909df7f94db52e48f70dc9d7bd8b203c388ad0bc7ddbaf540ceba87ab15e6e299d62473a8fd66ebeff12585ce7040c84650d2464f9d94
+EBUILD CGI-4.530.0.ebuild 963 BLAKE2B 56279259bb10664b7e18e6a3766f1fed85a6891cf834b8edf9ebf03e4e0456caa9be662e1c7e30471a5ce29291811e8e08ec8a3499b7ecc216e5777413765e24 SHA512 4f57f84e3ab559e26d091ede767fa28dca83e602c6b6a5771b335ab30d52a24afdeb3cf25ec1c3a1d513057ac6eabc435d59ad83c6ddea4f2a43de30a671fc17
 MISC metadata.xml 907 BLAKE2B 1b907ab91726723b459cb5d15cfdaf999c5362b1444855b41bc1f8019066add4042e02a77cf3f34d5c0669e5d72ea30efc5806c28d84f6aa16f665767717295b SHA512 dae5c307728f06c5b60a564512c366b59f3df66314c0564c91a8d8de4a331be0bad24dee0daf656f6a82d1be1b9dfb983618bb09c30629c46d514786fede6033
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
index 670d95e7df49..45c4c3b4e0bf 100644
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Inheritable, overridable class data"
 # License note: Artistic only for one file
 # https://rt.cpan.org/Public/Bug/Display.html?id=132835
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PERL_RM_FILES=(
 	t/pod.t
diff --git a/dev-perl/Class-Data-Inheritable/Manifest b/dev-perl/Class-Data-Inheritable/Manifest
index 8e9c65030bd6..873844a9cf85 100644
--- a/dev-perl/Class-Data-Inheritable/Manifest
+++ b/dev-perl/Class-Data-Inheritable/Manifest
@@ -1,5 +1,5 @@
 DIST Class-Data-Inheritable-0.08.tar.gz 5660 BLAKE2B 258e9d143b157b97995ace7236fbe12600d3de2c4301c6996ef66ac96c3d5f685224a0846fa0a52449e5c080dbaadc29ab9838037285ace5a6217bd69bb7ccd7 SHA512 bddc61096158b21d4cfa69538d5db0f53617a66c71447ee193141064f4f58194462b21e0a849510e24e4c263b13be3ee1bc6bb8504320e0a86c02b67ad1652c8
 DIST Class-Data-Inheritable-0.09.tar.gz 6087 BLAKE2B 687c4738b2323e707247e6544a20056b841d18ee8e12811a1e98ed2e0ce1ef6ea2bb4f3a8906df48cc7849ff16d347a6de3e99e8fa6cf992252a828dd1f92b96 SHA512 2e76aaf12c8d26442d53746e5d74636bb35c55461efb6d9b5ea50a635e3f781707b2d7f9cb3da9113ed31de464d3931f9734c29ace2a7ee5c6e111392b6a97cf
 EBUILD Class-Data-Inheritable-0.80.0-r4.ebuild 567 BLAKE2B 7940080c29aa140481b954be9be9da7342ebb9966fa0163ed86d5e08ae5951526efdcaee342ef147fddcc138324604c2e9936d23ed0ec9e31849ca0b31b6eaa7 SHA512 a3356ed11b3fbfc876d6b624764faadd096ae2c8ec0c8eb0facea2be9b9fe5d09acc831d97ea7f2e44c0b5239bd94b5970480e4d577cc9ee9f2094a91f630c7a
-EBUILD Class-Data-Inheritable-0.90.0.ebuild 572 BLAKE2B ed5ebfe0222365610643d77f1adc00cdcd913b1b9cff66fae56fdd791bbc61731a1901e093f9ee25ef355a29c857f97e6fb4b1b6eec5cee2443ba46aaaadf8ce SHA512 7a2bdc5290c6cc36e0eee38484a768ee284b066c4ea69a1eb8171378aa91131acadc2d3cd8eff7242f7fa098361dcd0bea163d4c8da1209ff26d97abbd3eb655
+EBUILD Class-Data-Inheritable-0.90.0.ebuild 571 BLAKE2B 8a35d2ca462521a89ccbb1e9ab1454d5388c38d8bee5f5329d75944df02ff6e473d74bdca9452caff32d3aa7a9d6254a959895b986c0a964e476e96ceffa8e55 SHA512 f140c113071f5ee4b7679ed69b9ccb8f44b71c75e3c2bbe810515c978f3203c454ad0ac506431c9f3f8b529ae44c02185fbb2bfc4e5408a0dc4a50a4752ebf85
 MISC metadata.xml 418 BLAKE2B 1af9d4842aac6bbb73db9418add1ca0b0b04e821689ed85788245e7d47aa87012700e62c587430bc4e4ec3e2b56f22e37ff02172fc3ff318019614f2ab3e2e75 SHA512 e1c57e31d0212bc9251525e658b70ca38893711ce32adae780f1fa9fd847e5209e496e6b5a984cc8a5349334c24672903a0a69c9bfb85e621babdac198d27aeb
diff --git a/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild b/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
index 154746501662..c3c6c42c9eea 100644
--- a/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
+++ b/dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Generate fast XS accessors without runtime compilation"
 # License note: perl 5-or-newer
 # https://bugs.gentoo.org/718946#c6
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ppc ~ppc64 ~riscv x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv x86 ~ppc-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-XSAccessor/Manifest b/dev-perl/Class-XSAccessor/Manifest
index 30486f2893a9..7de13af33d08 100644
--- a/dev-perl/Class-XSAccessor/Manifest
+++ b/dev-perl/Class-XSAccessor/Manifest
@@ -1,3 +1,3 @@
 DIST Class-XSAccessor-1.19.tar.gz 80786 BLAKE2B 4650d7d6a4ab2783292ae567f7b43e7268f665c04698ebf245ff4eaf7d6405aae6497e7a1edd056aa948b061c353fe8912553f0dc84e21b152c56be3f42b2d4c SHA512 58855bb2108b60cc90ae1d1c4d6a011da7bac2d063c7c953ff8610ae164ba60731a664f0fbddf148e1eabb60042913a17633a9c9a8936a23a59130b381bf63f8
-EBUILD Class-XSAccessor-1.190.0-r1.ebuild 710 BLAKE2B 5dc0521d8c83da35448a288352692c1618222cfd0f83c43ce82bb0e1601f3a8d5c16cd769729b74d1ace90881b5da7862537d461f8b712512e7db9b57a3fd2dd SHA512 7d6facaa495c0cf143c1861ea427bf3bdf0f2627acc176052b75ad635c5b9492092e4c239198a38224baa6e3205240348048c8d2557313be5bc03eeb103e600f
+EBUILD Class-XSAccessor-1.190.0-r1.ebuild 716 BLAKE2B d5dc478ea81055e9b21f144b564ed1e7ef7ccfb8e43c4bb5dfd0f5e505b0831d2daebc56e5fc414e0887eff5e38c6f3938f5177dda2524b0bef0ca34a8553049 SHA512 f43ee9a65dff086ef940aa7f5dbd05a18807efd11fb7eb0d1c211748cf82825ea8b3a563dd7b7822d9d0c561a9478b6dab08be87d9279b9c16e429defedf5a22
 MISC metadata.xml 476 BLAKE2B 15f5222ab2ac2056c747f2e80d656b13665a2d9e17e73941844044b0535e20cbffc553fbf543d6c56060a374f430cb4803f51bc7625ce8cefbd5b21fa71fd1ae SHA512 ba7108d4f0d479e9ba33e59da396ec1d274535e09b63cf26afaab81bf54549ff131b8dac1115f89b523d58c44d69188c1f0128f4ec54fd500d545b227306f6d9
diff --git a/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild b/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
index 7f2cee46f3e8..b3efdb3dfd05 100644
--- a/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
+++ b/dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Read/Write .ini style files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-File-Spec-3.300.0
diff --git a/dev-perl/Config-Tiny/Manifest b/dev-perl/Config-Tiny/Manifest
index 5b325b9252d2..5ff95d18f181 100644
--- a/dev-perl/Config-Tiny/Manifest
+++ b/dev-perl/Config-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Config-Tiny-2.26.tgz 22443 BLAKE2B 7b6e24de08559172920ef52968eb1dca1a1ce2b52b0e02fa1cd54c741402ec5eb9c32b46a911850410056ab7c8f04d9b85021e539d9439f6e8b3e4c847b36be0 SHA512 647c48f3c4480bf8bb8ec22b7b9a3a5b813d4bc633760f5aef4e03ea90b4b979a0a1617dfc3dba6c31779d04bc2d8233bf61ee509bceb8b2d32e1df481c3f135
 DIST Config-Tiny-2.27.tgz 22653 BLAKE2B 6c4f4db5ed3f6f18341cb19993e0b0e8e96dcaec17e705364cda6f652435d63b5143f2dbe1d75f001cbbdaa1647693ecdc0b7e8c9d77b0b94fa6a78730a2ef62 SHA512 2ab77d2f9e01f14047a2c079c58941d707fdc54ea0d30c43e0cfad162b8e810a25a62a435abd11b5da8a7cff9027511534205bf625a2ee9ee7824d4c3eb9d0e9
 EBUILD Config-Tiny-2.260.0.ebuild 680 BLAKE2B 07d2c571347fffc1c850a6600097e56261c98d932538f28ada64bb268cdc2ca9028368a64ed668543f522507e71d1850ebe8b5b4b4747117e64bc04d205e323b SHA512 46abec171a7de5cd565cb5039cb54b45923b5907912dd30182f942936c2a4485dd3fb6bfc34e9fdd2bc6a69c289ff00f8e7d00cfbe87e4af3a5c352087be459b
-EBUILD Config-Tiny-2.270.0.ebuild 640 BLAKE2B 6bb0e278d779c3bd3295f01e7b3131b46ac9e5ea9c4fa03fe93ac2789324ccdcd271679f2991f32b2d4887ea025119f1a76c85557dbc7ce9788371ca33a4b9e4 SHA512 a1905db14f73a831b734c2a673a6e6087a9486ce8ef2425e450df66980471dd400454224c58f32a7a11d7eab756cab2469e9356fb025348635ba94852da6f1b7
+EBUILD Config-Tiny-2.270.0.ebuild 639 BLAKE2B 0998b6948339445ff283e09b20e0d7a3eeaa10593a3c2d1522cc478d6167b98780720376209eecd3b397c406ffccac719f344585cbad6e46fb3a170cd90d5eee SHA512 5fa4780861cb001e0844ae408eef30446f7e056a450b6971c612abb6838532168b0c3cf3c1bdb7186b4e84bfc25246690a3c2b19f43281804ba3c9ea11aee8cb
 MISC metadata.xml 395 BLAKE2B edaab60fca18e627f1f74b1e7d7792b6a4dd666f7f02908d27a7f6c29bec9049facd968a41aae8b7643c51c85d701e1526c7cbb869cd7b8dae5cff8ae14e2eae SHA512 0dc84787aa032ad27aabe5eb851c3178662b396739bb3ffc53577f650bb1fca180b4b51074dc557a32bd393db4f28ef4facde8586925fd6174493f83cb985ed1
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
index 96903547a268..451de173dd9a 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Standard en/decode of ASN.1 structures"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Convert-ASN1/Manifest b/dev-perl/Convert-ASN1/Manifest
index 2ef7789694e1..c2fde2fa1d17 100644
--- a/dev-perl/Convert-ASN1/Manifest
+++ b/dev-perl/Convert-ASN1/Manifest
@@ -3,5 +3,5 @@ AUX Convert-ASN1-0.270.0-perl-526.patch 6189 BLAKE2B 93614ec863a4a90e195fb7e99e4
 DIST Convert-ASN1-0.27.tar.gz 74081 BLAKE2B 14929ec5f25ac85465204fb8f584384c5c65e73cb3ee5bfd9510a9bb2580e7c1a86f485af99ab7cd83813914ae6e277020720d26af8d2bda54acdd06fff7e984 SHA512 253bc0c1b2919841497a95bcbd05825217a3013c7f789fd9f3d389808fb015daca91f5c149797574bf32d38e94efb7f1d8df62e9e4c13928ec3b978cc9fd6fe8
 DIST Convert-ASN1-0.33.tar.gz 79306 BLAKE2B 591c45a5aa6d934e1fabd2c0f02614b2efb229e717b0ec15b84f3ec8d8bb6960eca84a38ef4a5609c7a67455c20d07d44aec0ac273ada11619b5886bce717b59 SHA512 be66298816d41965d1d579ea60186f62d0f00585fbeba8422eee71e4ec4a06026d36eab5144c305da2525c5d652b5f1eed7ade039d93136bfc81d28b496c74f8
 EBUILD Convert-ASN1-0.270.0-r1.ebuild 657 BLAKE2B b73ecebd1a596220bf73b15d6a2c17bf8a77171ecffed30bbd614267d45455fb6a4b5fcacf7e72c63dee94d9a3e3f7683f82f81d0c34c5cfd83510f4d32c8bd5 SHA512 934bca4e5b612a8f6b087484ddb85a8c827c0f8bb6142c2d28d6ea6ca98b7d50eb370274d8e39a41cacb1eb22b6eeb47d8a72dbf43112d7426b8aff88a71848b
-EBUILD Convert-ASN1-0.330.0.ebuild 516 BLAKE2B 1d5ae5430beed660db1bada897b90cd4a28c5e5c30b68008099c3c2c47db4a41dbc841128ea3ae1496ca03b0fad7ceacefde053782bb4e36257ac645c67e3371 SHA512 a9816286f9c7e425189f1d5fa48ac971015be81576582efed688a05068b8d92cb1e4ab7028aa34e133cb5f4d6a12c910ba3368ee84a3f24586bed0a734c2ab4e
+EBUILD Convert-ASN1-0.330.0.ebuild 515 BLAKE2B e3fb40d135974b4dfd86bb10c3f3a282e2e6e68aa314a7a43d3963a62c8416e3bacd9728d9859fda804674cc3e1e37362fdbb7d48a2b25a0187786d30e8176a2 SHA512 9b14b0b3c440e7947867f99b93cfc5e368236f03f230366d6f69e8ab734511d6ad22101b40c8f24c016cf330b630f129060f30b755a7ca00cdbc05986aac6593
 MISC metadata.xml 397 BLAKE2B b1d6a0462ba2f42d68e9ef44d929196ba10676f1dcb61c526613c46ff8d5077569e7f7f73af19af737652f992eda5f41f1047eb2f9252a962ef14802c49a5244 SHA512 7287d7e8d83236d6bb3d6166713e3bdd9ffb9eb2c71280f292a11c829b503a0fbc9a610a1456e19a2de4fa3d4f7af7fbbcc1a1b8bff3372d6dcb4c016b3e377b
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
index 6fab635e52a3..e91725176793 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=virtual/perl-Math-BigInt-1.160.0
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index f0e95fa3be43..3f3af40ef881 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -3,5 +3,5 @@ DIST Cpanel-JSON-XS-4.26.tar.gz 254123 BLAKE2B 52a42c48b920a536a9c203964a4a37955
 DIST Cpanel-JSON-XS-4.27.tar.gz 254221 BLAKE2B 02000882b22413e2012d9b63e2dbf78c5cc4d1263c15132592d6a219b0ab4ace15ca7e833e1abaa950363a0dccccba1e505c48160cc1a69af884b007ebb8ca49 SHA512 881da3685f96111db5b99fd6889f40af49398c77b24afed3a92d852c615448fc7221d7f2c417a7abbb50e49176092379b20c90a0cafb324817dc2f6d8bfa794b
 EBUILD Cpanel-JSON-XS-4.240.0.ebuild 1462 BLAKE2B 623f1257ed431f84c6f2b0b370b164a76a8f8154f0f6b325600e144384cf315288b76d3692548a96cfeca7e2f1513a80d5acc49a1ba611b77be6827462117d8b SHA512 2d5148ff49da822dd6410d6d5a7bff6c975f5381f27b683a31fa9205ab2196e0500872c4bcb768b2055211ea12346da1cf47012f9dffca46cc7ff61bb4ba3e67
 EBUILD Cpanel-JSON-XS-4.260.0.ebuild 1460 BLAKE2B be08e53a1e61afe37384fcc3f7d34dd4c34d8dd4f9bded2e007089339968c1c02f52b485b7f1eba98ad470a8bc43351fc9b672f68186ae4666c73f6a2dcbd8e8 SHA512 a6a549fb7a4ac89ab6c250dc1039de77444571ec0193cadb962244cf138465fd5b7b21e7c48680bc2c6792c63be37984c30483e7b214c67cdcdf4ecf7969ed31
-EBUILD Cpanel-JSON-XS-4.270.0.ebuild 1154 BLAKE2B d85b5035c75970c7089c57102a77fbf93724374df25fc32529bd9fc12ce4680f0b2b0e8a9297faae2d2950a69af8fb7ae0ea8001b9d08edcbdc4b1a9fefb5d1f SHA512 18fd40d11b32ba596b6d5ab46aef3c32ec26dcd981ec31c3cad20fb63439da488fa060585698b35cc789e058b8139ec83c40cded7f1ab844dfa54e2209f5c9cb
+EBUILD Cpanel-JSON-XS-4.270.0.ebuild 1153 BLAKE2B 50095a016f962dbdb7647e10865b090b1190ff13272f79edca251e98e66dba9bcff2ccd7acb94cd97e1b0a5a5f15ad35075a3266cc869f260f2e64f7a6a74d04 SHA512 ea0a34f4c1c0f2627587cc11669f80b52c6009c23bd761522edfdbb8ed47c57dbf6bd6ab1907662dcb194d6d99a2edd9a51dc9673c71c5e4d1c26955400b8694
 MISC metadata.xml 471 BLAKE2B 65685b2accba3914e74f5c8f993fd2a8dee694ea6e0bed7393a4e8050d741fd352f03383d52420ee85a6dceedd2a485c886d1ff25c8835b1444fb1000a067022 SHA512 4edf8236a19c33f4562110b31c1f11950211d7888e8842b09ce9bda8c513939bd8e96244f646b7f26dd974175703c7100a7158ac496fd1b33ccde5c5b62424a2
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild
index 14b7be6628b2..9aeeb9995b64 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Self Contained RDBMS in a DBI Driver"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="system-sqlite"
 
 # Please read https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/DBD-SQLite
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 295ef29735da..5ee229e4fec4 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -2,5 +2,5 @@ AUX DBD-SQLite-1.64-no-bundle.patch 722 BLAKE2B 6c906a72b8ecc0111eed947ce9ab06c8
 DIST DBD-SQLite-1.66.tar.gz 2483436 BLAKE2B 269f10652b1ca5b56d7db096c5cb9010d0103b28f3eca88a426adbacab7a84cd22002af752fcb6afd8a47d87ba702434640a2c398055eca4b37016e104f26bd7 SHA512 4d58003e69f29b18d01ed0b5853cdac40ec9ce5d4c75bc8a3743937897a38290a99be30b1b9fae593b0d8d51d05b7e2438d29f7a7c1c755b66de51826397aef9
 DIST DBD-SQLite-1.70.tar.gz 2537672 BLAKE2B 30703bce48e4c4c91a60fa863210e91a2443167201583393700b550f9e91a908a881a3acaf643c901b2305792a6200207caaaf5e12fda315f4572a12c1ebdb6b SHA512 163d53a8a214202a39b346ae023f9d10255c69dde537bc764a4ef312b62ef7b02ae1400e6c1a59d0483fd98abba6c36939214c13f5d9b3a2727c41753ba59060
 EBUILD DBD-SQLite-1.660.0.ebuild 1412 BLAKE2B 0671faed5b3a45e7bf9d8bcd4e08742bb6cd6b377cc35c7efd2daaff97f67462fa81f5babf0ea8977a7f71d55b7d8ada6e650d320a8ef4e8d5094891ae038d89 SHA512 7cdcf47a4a4c3bcd5eb03a36a662204a4673781d47c93fdf0f1dad5cc4764c1a073eb3973fab3e374aed10c56f3cb96478022a409037fd4c5c098193ede2eb50
-EBUILD DBD-SQLite-1.700.0.ebuild 1303 BLAKE2B 4a2a323b1f8367b12643898fe473a2cd5f3e1675122ecadaf483d5c22fd4f925b5f9a72ce10f55b874e093862d30a30552785a0f9abbdea1bbeff5835a552bfe SHA512 5bf808f2d9fc21b7fbdcfe526831069614790823c2163f7b2e1d53f12d4ee450f32849e0326e9022a840480835ad26956792984668a7f08609ad8114a5b3ad60
+EBUILD DBD-SQLite-1.700.0.ebuild 1302 BLAKE2B 5f7b345f992e6f7ee19fe2ca8d7789ed7451f96295c0055f0d4600151863f9c724b30029874d652549a880b4930ba66855de40d7229352dd48a0feeeb32d69f4 SHA512 0c6ac4bc81db3c78619be8caa886ae1f6c07cb48a78c539a58e6084073ceb545973f8dbb076fd0ef70fd0abad743cd565c6e1146e4690894d008cbe77d8a1141
 MISC metadata.xml 1144 BLAKE2B 6fd95b7afc6f741971272b1781c1477506f380d796d2298546715490fda34379338e6e5e536f464fd8f7e3d2de9294ab7787c7ec09f885060af74e60f173f05e SHA512 fd7b6a5e97c6f29f48af30c7a58c72f8569b0e6c26accb8cbf40273011923ff36658382d214ceef04118e3137411f388bfbe3988d98b74384db771292be4cbe5
diff --git a/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild b/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
index e40369fb482b..00c18080a1d7 100644
--- a/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
+++ b/dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="parse and validate simple name/value option pairs"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/Sub-Install-0.921.0
diff --git a/dev-perl/Data-OptList/Manifest b/dev-perl/Data-OptList/Manifest
index 3ae4fdb64004..33bccb9352c7 100644
--- a/dev-perl/Data-OptList/Manifest
+++ b/dev-perl/Data-OptList/Manifest
@@ -1,5 +1,5 @@
 DIST Data-OptList-0.110.tar.gz 18846 BLAKE2B 509e12842175d6928805ad58969986fd91f707af9b04ca56bac15658b0ca8ea1de9494500282f8a97ecfb874dcb560b8c14681c80c5d91e7941e44b981a7761f SHA512 68393958a38f509a71cfba61f6dff8303821918ba29ad8492af0c23cfd4f741c6ce98c4f68ad295f27e166287fc546229c430816f0bdd6009d4f60860c967b76
 DIST Data-OptList-0.112.tar.gz 19764 BLAKE2B 2d4ea3f4e9333b04d3eb767aa9f3ab0cc570d127d909b857afdecc50039904433fa8102911e5ae63c4b89e249d8e64c7a708f8e83e5e0130903c73f20b73fb90 SHA512 79198ef244b4e5cb5201f938f228f20158ccdde76ff9d200b706104ddac5dc3ac8da3280ba335a60fd66d16202b803447ac7709a7d84e514d3a3dc59327ddc71
 EBUILD Data-OptList-0.110.0.ebuild 703 BLAKE2B a1b67f5fae1cca53e92f036f36fcf1dd76046515e1a31e2033c918b2426d6b679a3f984af8de874a4131a78c94bc12809197745ad5d96168efa21d42f7bc8fea SHA512 3e83578c33dc0b304df1ca68aa78ef25acaa1dbaf1f8fd30244f4b5fb60819820b626eea7da1b5b9dfd3304a3132ec48126b11fe46e0ac00e9935450cc7de45d
-EBUILD Data-OptList-0.112.0.ebuild 667 BLAKE2B cdca5c6d9f10c1255d03a6f88378ffafc3f1b7a0f720f25c6183c236ebf50f3c552063e76f5542c7b308c5d87d6ae4dda55585e6b9a04e3d5550788fe753b38e SHA512 13d2fd39561b81ab7d15a8ca630f44cd62c84d0ef72bd14ee5fa9a656fa1a5e551ab9cf9a41a249714b318f497b438e7b3b1931dfe796ea6fc5c546d9cf5e1ad
+EBUILD Data-OptList-0.112.0.ebuild 666 BLAKE2B 2f66007af6e671854b4f100a3818fc7898860dd06f961a80512f81fac9d433e9c3b7dcf13bc4469a896acb5738005cf30787427e78d5b46e1543695a20948f09 SHA512 37e892c295f5936cbd7bceaf507c5c73f8b675c1e805bccf21fd8540bfa672d6542b4761b2bca3d080e1dfc3006af5feb10ee630ca5107d1e1fd22c2ea7410da
 MISC metadata.xml 397 BLAKE2B 9c837d6e740042b702a3e8b7140814dcbc6dafe78c766507eabf62446bc5429617bcf0bb5a449741a20ae4a690407954e94c98fabf0e8863c8c890df87d2f2b7 SHA512 98d0c5aa49b8cbae52af7d890d903874716f83869c8adbcde49f864724f1432c51c8b12e322ad098386def00e3d946f0d6bb4da23d62bce17782b5539369de9e
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.500.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.500.0.ebuild
index ae4eeab93ee2..e6d275a97895 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.500.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.500.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Time zone object base class and factory"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/Class-Singleton-1.30.0
diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index ae320cda4144..fcdf5c3bd4c2 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -1,5 +1,5 @@
 DIST DateTime-TimeZone-2.47.tar.gz 1006477 BLAKE2B 51d538f2e83c4179f0b77033953f7b8cb23b8978d916ae5e390acd773a59705f80a25ff3874bc71fa8c8f3ee94c8c755b59f76e8689e277a0ca4a4988bba69bf SHA512 483c5314fa520c1597ad9c819b6785302cc77d719e4042babe6a35e72e7600e9b9d506950979d4051825588ad45efb0a2023bc08340e6fbb308f03706f3438bf
 DIST DateTime-TimeZone-2.50.tar.gz 996568 BLAKE2B 62512945ce26617343ff53d458760fe1da67a330007999915e57276c7194750771a47da2780282a6d6271e0600002d77c484f70a26f0afd8331827fc82554ffe SHA512 3fa436bdcccdda2bc7d9506b0faaad654731b6bfb886ff1c69544211b697deb2a6d9810b4cfb858109b42bd4e53e532b2b958157a99108f2100038fd2f953e24
 EBUILD DateTime-TimeZone-2.470.0.ebuild 940 BLAKE2B 49f5ac562ff0866d0207b86b85588275394dce402a6b1717afce98f7321c037fad7b7d2e4e81f2f5424cfdd37ca4d96c79f440a4c2aa8e3821aac18ece49545d SHA512 6277fb9eca65d57a43434ac00d04acd370d6b8788b29cf05d537ad8a854dd4dcbfede65e2669c804a47733d5eddffb96332cead16806f59856dbb08f4d8b7de5
-EBUILD DateTime-TimeZone-2.500.0.ebuild 902 BLAKE2B bb7f49abb6e6bec2c9c5212f07da62a74f1bc4e43853863ed27bff27071a4ec67d2139aceeaf8f12a7c9dbbcfe79be5ed4063bbb10beae6c3b22cf5d2d572434 SHA512 d0b8697578686fc1ef4983549b9ba10fc733bd68a53b8d2a4aab6c003a0b14e6eee215be5c5e04a1917c230512c1146feb875828ca0d483078629eb759f940e4
+EBUILD DateTime-TimeZone-2.500.0.ebuild 901 BLAKE2B 04c31de14070c19cdb33ca242700c0fd055854cae0802099da842dec944c314301bfddf367cf95b0f08f6aef6973d1891bbfa8cb5bd24261213669f7ba3aee8f SHA512 7b8ff8fd69792a17920286ee678470c8a38dd74a63ab132d89c749a9b28b63ce4ca2aaa0ccea0c1583b1f193727ad3c5f96ae40ff3a53ba47eee656ba11333e3
 MISC metadata.xml 31313 BLAKE2B 98b7ffebb5825d4ed6dfb2cdf1e451431738c5b08c428977dac880dafc9b78a0518e9c39262dba8de76169f4ad4715a21a8d42e18d6b35cdbe901b5c2772722d SHA512 b06ba76d7c41edd3f825cf06ae338d089b3d4fa53ef4c2fd0f90196e1ab406fc7080af57b0f3a285241c69251fb93ab55018c3dadd51d5da8a747f7611daa8fa
diff --git a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.870.0.ebuild b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.870.0.ebuild
index e4b51489a192..13fb319aee2f 100644
--- a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.870.0.ebuild
+++ b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.870.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check what OS we're running on"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 
 RDEPEND="
 	>=dev-perl/File-Find-Rule-0.280.0
diff --git a/dev-perl/Devel-CheckOS/Manifest b/dev-perl/Devel-CheckOS/Manifest
index 85dde292ac99..ae15e0713a1e 100644
--- a/dev-perl/Devel-CheckOS/Manifest
+++ b/dev-perl/Devel-CheckOS/Manifest
@@ -1,5 +1,5 @@
 DIST Devel-CheckOS-1.86.tar.gz 33703 BLAKE2B 5b9906bef035c1f388bf91ea00ae1bc371375b3c2387e5b5f362f36fe77d7e7f67e8d0b570e9eeb3668e39b24de9715de8533d9c28585aac8c90c306972390d1 SHA512 8f3c87a18a014549b0c1490c09e365e53ee016c8a19bd3945396b1f449f373ac1f2f89ddca3f9fa4c6051cbad1cc32fbb42c76ee9ddfa3d3e2e7ca3fa125a6f0
 DIST Devel-CheckOS-1.87.tar.gz 33745 BLAKE2B 9f875c8351c3686b75d6dddf0e4b7c07a5c3ce793db0d6c6ca060da96473d748f6e9d0d7c642097e1949c1ddb0862108cafd3378254c235a5ee37c0e7044f0e6 SHA512 4f41bf38ebbc77f30363bfdf677c8d271a0d17810e211fb7bef7f3d533ec92d2a1575567019c0e1edf44854f5a3dfd80ed787bea4ad8a1806d388b0e92a1b4b9
 EBUILD Devel-CheckOS-1.860.0.ebuild 521 BLAKE2B b050cc6421ec10fc27994346ee581311b8ad4607f7cf27c884c7289bcb25c9e701d044a0a4cc0573aa847d3589417c508968171813c6e6b4c2d6c596bdf24476 SHA512 83a5325990a15b5635b0f411adff5d14f9bc12d24386697204b140756edf3961f0b8181cacdaa6e8a7aef4e78461a71c5116729c80371ca3161b7f4807942de7
-EBUILD Devel-CheckOS-1.870.0.ebuild 483 BLAKE2B a529905eda480d0687270a6f358b5513da40b02fbbeeb9abad0c6ce7278d96fb9042e5c7e33670c3f9f90bdbc73727784d0f5e2d1ea53b0af6c212689795df85 SHA512 8b77bbae1bd90c25f6cb6f9f8a19df425ea4a19de07a874e6556e599789e90cc8b6cb69c6c6661951470378966dd4a61eca0397eca7ec37d6df2669130424bfd
+EBUILD Devel-CheckOS-1.870.0.ebuild 482 BLAKE2B 3c39d74c7b97d36b68aa8f4373049958c8843724ba138da911a00e9fa8b77e1ffbe7493f6caf3d9a8eed48da382c2e53e549df273c70d7b307e4037187a561ad SHA512 711698384b4df20937c34191468c6befb619735633b2b937d37039f0e9d610c2dd516387656f354c2ae5222e94372d761f344fd9b8550eebc65a054294db1da7
 MISC metadata.xml 5700 BLAKE2B 7763894bbe0425cbb8e05c5e0da79321bb049f5962d7e03f62a13b6e730808a559d5ee7b43d5930ec0f20d5aa61c4235cca49c84d7458061a7ef5231df7cf851 SHA512 71e671f4cfb05fc8f669f3ec2f1a07b97073e81fe0926210a2b7aab05e833cea15282d67a63f796fb22655846682a566b795b397cf622e78f10874d9e52f2db3
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
index 246976fb8655..f3fd453d6786 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the Freedesktop.org base directory specification"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/File-BaseDir/Manifest b/dev-perl/File-BaseDir/Manifest
index a32a5e9aa42a..559d148963e6 100644
--- a/dev-perl/File-BaseDir/Manifest
+++ b/dev-perl/File-BaseDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-BaseDir-0.08.tar.gz 10052 BLAKE2B 63b1d9777c332f3d4a56e4ae53aa78f1b5793af52b2c4e749586b33d7700c1e5b66e386a770faf8d9d3d04bc0d296dce69f1d9f2bf36e44839b43d089c6981ff SHA512 6b44edca34906c34d574933c21c0e3a1a236a431a3ac12caeabcc2638688dfe1c02efc9a1e75a2c2cd522de0dca00df0620cd262c184ec938cc97766d1121f99
 DIST File-BaseDir-0.09.tar.gz 21508 BLAKE2B 7f8cbd9702d9cd7b14cc4992ba651be3d80ccbc07af06a41447ef3a6baf2a6cf23f51e87e2179fa0bc8a5e2394466c4a6632693dd6694f56eb77a5323e5f17c9 SHA512 07b07f43bce392beda6ac10729925c3b6ad850f0af5485c3f540b72353a1e877e7e9b76580057197cf68864086f1a3d1f9459cfcf142f16772f48125426d72db
 EBUILD File-BaseDir-0.80.0.ebuild 880 BLAKE2B fb548e9ea1f19c369986aa12ed728c36143c0013eb67a7ee5e83926ee520790e0161fdce1f434c513c563c19d2cfe686551d9da0f4e4cb297255b1e8f35fa8a3 SHA512 aaebe312ba7c511a224e1b6e940fe8c2d775b31c296cb8d61d54e38a3c4d71e3868c8deab0e13096195b964e30f094399af3c3ebef959231fbe12b2659e72210
-EBUILD File-BaseDir-0.90.0.ebuild 713 BLAKE2B 670aeb1ffaeef89a94a8aad0248d19c82ac48ccd0edf6e4c87dc56d26465c194db7766461a4b6032c774a353df108e1f20c5fd6abdfab5a91393ca264cea0890 SHA512 a415c369f3445d12424a131182363d6bb9c2c6df298b09d1273d3f0e1b3142b93f9bc5e96dba9225ce283b2e8a66c678e536aefc80e19e26dc61999f688424e7
+EBUILD File-BaseDir-0.90.0.ebuild 712 BLAKE2B b8dc80ec057b66741914925065014c0f928816aa18a16d93339716c94c40fb55430a01fb97ff12eae7ab20bd4eb05f80926fb287dc041af76d1cb9f17e793ca7 SHA512 337e78d89ad94f949d27c3ee556f77b453f45ef53a30dfd286fc4636d97968fe1856af3b7e8fd779bbba0b6c5e6cf4865dab847a158a4ceb747b509edeb50445
 MISC metadata.xml 520 BLAKE2B 60bd66bf634fd40fd076e7fb64874fdf4a8bbdf75ddc0ecbb85a4d11694bd0b66535ee366c320a21dfefaa49c4c78a1fa28ebbc5dc0d4d721c944bd5838c25bc SHA512 933bfffe79454f643ae91fc517e9b3bfd4ccf8064e8d39a394fa08808fa5cfffa9a42f057862100dc27a786b47c9d1da9ecefa5f7b991395216c8912cd5c5185
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 8c74e8ebfb7f..459847efdaed 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Mouse/Manifest b/dev-perl/Mouse/Manifest
index b74ca0c4b48e..20967daa6a0c 100644
--- a/dev-perl/Mouse/Manifest
+++ b/dev-perl/Mouse/Manifest
@@ -1,5 +1,5 @@
 DIST Mouse-v2.4.10.tar.gz 222745 BLAKE2B 3d0f5d3c6f9183f67db24ec9859bd945080bf5f9f9aa370dfb6803a6d32e7e01e589540d24bdc0a0fe338a08d9f89845bd8ef060d381717ec709877de066f2c5 SHA512 57d797bed24ccea66307d95395bb7d5dd860c0bc41e25a7701cf5a16fdf28776dc7633a6b8bbb1bcf6684b930385da71bf2d44f777a211988a500e30bdf8e9e5
 DIST Mouse-v2.5.10.tar.gz 220349 BLAKE2B beeb21bac24f3a89b3850e8d6b720dccce2142dd32b03a0235f57bc93de76cb5b277d1a38a50e219c0bf9c8924557c7c85d659ce9453f0211c939d0efb78ea37 SHA512 949a2f18257a5afcf4dbbb84094974f4d80e1e4531b4b9d8618cf141252fd11b09b79daafe1de79faa620905988f649627bc2fceac357ea2f180db74cd48f711
 EBUILD Mouse-2.4.10-r1.ebuild 1062 BLAKE2B 7e43f82c5c8375371056bf4c29e13be2508cbb2ac7e0f726b71273fd29c96c3c33c7d2f93da298aaf4838523f957b5aff005d81b8dccff47f7df488f666bc8c0 SHA512 91b5e7f8d4d02d78b1e98135231decf41286af3ddda263b8a3aafa00fbf0e8fd236a7e05b29e78784f1b67a1a3e3e88e349e051cdd8e90adcbb4ba0726226477
-EBUILD Mouse-2.5.10.ebuild 1010 BLAKE2B d254d7931d4c7a94c75fe10d9b640a8c53c70defb2a6ba67909f35d533a7903003858002268b6bfa76171c12dc3cc1c8f66fd25d0d3f81ac7a4f8fcdc525f7ac SHA512 5e1bbb64d7fb7eb7dbf4d3a7f4c382e2c5c73a057115b9cdd74072ed8639f2a21e9f98eca39f971d105db0cbfe737574f9a9367cf36e6aa1bdd0010c769df931
+EBUILD Mouse-2.5.10.ebuild 1009 BLAKE2B 0943031c303d5fe05a9f2561d1c5961dc70bcd214eaa03ba9716ab3df71266b17fa96b121a7eb04c0ffdf08d352009da9f2ec5b9d8cc31c4f468dfb92ac2b932 SHA512 ccc120e24eaf9fcb3795a8b19cfc5306574e032f7430faa195e1dc5ed5d16159337fb525b0bf4ab0adb5c9455f8e1cae1604c9323cf92e647b5276f33f1547a8
 MISC metadata.xml 2263 BLAKE2B 125a9173f0ef445c3eda10ec00071cfe7904de605c06a57a7a4e5827abf4cafd1183f74c8882d543234c618085046cd0ae1feba582604bda8d425a448c046b6d SHA512 b6177488e3242896aa9d0ec8f3f0fa9f92c1a12ed1802c983669dbd74d6812947963256c362b5e876984280049341b53b87ca492148e8e44fda6d4ef87498a5f
diff --git a/dev-perl/Mouse/Mouse-2.5.10.ebuild b/dev-perl/Mouse/Mouse-2.5.10.ebuild
index acd2b669859d..d196ba0b3ab4 100644
--- a/dev-perl/Mouse/Mouse-2.5.10.ebuild
+++ b/dev-perl/Mouse/Mouse-2.5.10.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Moose minus the antlers"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.140.0
diff --git a/dev-perl/Proc-ProcessTable/Manifest b/dev-perl/Proc-ProcessTable/Manifest
index 7d3fc40adde3..23235e0c7476 100644
--- a/dev-perl/Proc-ProcessTable/Manifest
+++ b/dev-perl/Proc-ProcessTable/Manifest
@@ -2,5 +2,5 @@ AUX amd64_canonicalize_file_name_definition.patch 396 BLAKE2B a26231fc5009f5763b
 DIST Proc-ProcessTable-0.59.tar.gz 75949 BLAKE2B fedcb0d407164492df551d88c1bd57997c3c55d86cac975ce6dd9f21a61479ef86e1bd5c9731a7519fdac4a4be1a06e1a86f8567f961f691b1a6d0bf6cffd7d4 SHA512 25162732cdbfdc151db69d6b225137c60dcd1dc31671119007814b2bb82dd7d7c50f4ec4ef49e0cdf2eb04d6d7b60f4d6d39804ab9acada5f1b0230b387e352c
 DIST Proc-ProcessTable-0.634.tar.gz 97429 BLAKE2B 67ac1046cdcd49dc3b1821fbe8ac4b9018c7c9f2da04e2ba0bde5c6d98aa93a183f45d693cbd77311d9da1707e281737014dbb3f79e040909857d2c740c102ee SHA512 0622b205b80fdced53163beb07b2bbcf7b5839349c785e9f15fb7bedae69fe2e25287e6c58db94f88cabb905c1bdfe9c5ff1eaee01f0bb2a3d695365cca25264
 EBUILD Proc-ProcessTable-0.590.0.ebuild 509 BLAKE2B 2cfd5fe2e39bad2bd2baa5289c14e88bc824bdae142e89ad505a7e0d67323cb0760d804ec9f9fbd05308af0aeb2865e5f57a2bbd42ad642503abe0735b757fb5 SHA512 84e5d962bdfac71fd6a5fcc941aafc8e022732042d9bedc66b80943d355a665c8c53b5e57c9bcc7526811cdc9e790cc5427f370503ce76405e36abc73375d7d2
-EBUILD Proc-ProcessTable-0.634.0.ebuild 567 BLAKE2B 9dc5a6bc1d40aba3ba7b3951b09535ea56060bfcd32264b3dc64cc5203c31b3147d56214a78e1196ad2a5ab17ba896da25c5cc1b09776d522d0448febfe89b2f SHA512 dd050d03700a4b15944cde17b58d03e39e894357183bb39926e9e061855ced0fa5fde535dd48d19f50a5cf0d9c0e53507866120c2977488e4b62cb6b9b436f56
+EBUILD Proc-ProcessTable-0.634.0.ebuild 563 BLAKE2B 7b436b2bd01494436374b13722ad560709ffe9d0848f311dd291552d5fb3b9998bb3fc406e884f4c69a8264eb54927e4f9a7fd9c42a6524318799385d48bc9d8 SHA512 0a1de49f315e42b03556a0c878a10362e44c9d050dd41071af38da58f56261f6ec578e7c659ce7509f77b15fe5ee132c0065cc8d367a9fdedfd9db564e57c1b8
 MISC metadata.xml 601 BLAKE2B 6adbf699222c929e38bea5631af0f964135f59072e8403287bf5f2c26bf7359ca07d18b91601175999c48fdd063a31d4eb4d5c2742d8020428e029c82843e46d SHA512 c7164f478523f7eadc695dbcaee0fb37c068cfc246596173c4f3995a4d31d9bbdccd2e2ba3088658d6f08955e6d80e385cb16eb5a039ffa53cdca72b363c8def
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.634.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.634.0.ebuild
index adc73377e37a..2e41cdc23820 100644
--- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.634.0.ebuild
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.634.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Unix process table information"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/SQL-Abstract-Limit/Manifest b/dev-perl/SQL-Abstract-Limit/Manifest
index 183034c20218..4760d5fa1414 100644
--- a/dev-perl/SQL-Abstract-Limit/Manifest
+++ b/dev-perl/SQL-Abstract-Limit/Manifest
@@ -1,5 +1,3 @@
-DIST SQL-Abstract-Limit-0.141.tar.gz 15877 BLAKE2B 4ed381c5bd91940277df26cd21152e15f5ba8713d32050eb9cf9dc9e0e0849340d6ab0cbf652f13c90c0c9ef623229bfed0c511b35deb698001911e08173a2f3 SHA512 f7c09b14fe9cb94675bdfbc428d38f9653352f6dae090dc5ce905e5886205192bbe1da8ebff53780c0cac39d078930ef2644ea238d8e8be5b0a577b7b75df7a9
 DIST SQL-Abstract-Limit-0.143.tar.gz 16971 BLAKE2B 1b74e46da70cbb2b486dd391102c4c66dcbd4be932d1d3248962071c6690a7e75dd67730d4e176590fa21922b19aa0adacaa6c02d905dd136da79befac1e711d SHA512 1b91dcffef5c02ee7ce7d2a0124942270104a777c6cf42ed5bd3ed7ee263c680e5a1b93c342921884edca48e7dc5c2c01cacdf20be1988286e6dc50cab11ed0c
-EBUILD SQL-Abstract-Limit-0.141.0-r1.ebuild 471 BLAKE2B 671eacff33d5fcca0149020ea02d283b4e58a3bd071fa425eea16f27b9d457c5f0357737a10ef13568f560e494cd64a25164e6ec897c9baea139536129d013e1 SHA512 40190d3b2de6446b565e3368751c2242ebba12cde19124d3f7ada7a80bda63f7b0baee087ffe21e50962a049b4457859b2eb0a004d520e61bf62c33486eadddf
 EBUILD SQL-Abstract-Limit-0.143.0.ebuild 416 BLAKE2B bb88d6881ec9d981a30b7e288993e8dad463ee68ee08ab17c365a148ea20746ce101bdd9dfd8531cde9446982a427591ef6810cc51c1ffc2baaf25cca8953f00 SHA512 ad50b05db0b64d3522816c4fe8070a0d15a3ae02a005044b93b523ed6e22d3684befb46b0a1cc09468853650b6b4f5f1684f87539fc477d9462405d7c09584b2
 MISC metadata.xml 410 BLAKE2B 9f576a7a85c23294029b9204d700f8ae4adc271b1e281a4adcd7e150047eeb3ce4033865809f31ea38e915f2a6d013107bf636d30298fdf92aa0065f6fe16f43 SHA512 d53a57ad9fb3ff6a8ba8be29c8e4e3d9d5a03d7c71c7c81f1d9ecd56dbe6e632c86cd75d2f5de80a7d2dd772123149863a49c6042053f5431e47174b8380b267
diff --git a/dev-perl/SQL-Abstract-Limit/SQL-Abstract-Limit-0.141.0-r1.ebuild b/dev-perl/SQL-Abstract-Limit/SQL-Abstract-Limit-0.141.0-r1.ebuild
deleted file mode 100644
index 1d26790d45b6..000000000000
--- a/dev-perl/SQL-Abstract-Limit/SQL-Abstract-Limit-0.141.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DAVEBAIRD
-MODULE_VERSION=0.141
-inherit perl-module
-
-DESCRIPTION="Portable LIMIT emulation"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/SQL-Abstract
-	 dev-perl/DBI"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Deep
-		dev-perl/Test-Exception
-	)"
-
-SRC_TEST=do
diff --git a/dev-perl/SQL-Abstract/Manifest b/dev-perl/SQL-Abstract/Manifest
index 38033c586761..2f05250ed618 100644
--- a/dev-perl/SQL-Abstract/Manifest
+++ b/dev-perl/SQL-Abstract/Manifest
@@ -1,5 +1,3 @@
-DIST SQL-Abstract-1.84.tar.gz 98744 BLAKE2B 96298b926beb35a3d8e07c5861d85496f7633585fb542dc1d6ac370cab4a6fb0de75b273e4d2cb96fe11e39d8ef739ad7f23bf37b73c60893ff1b2272c75ef80 SHA512 2d41ca76cc50dcf85e40b6585b3036ae62801ce78b64cc3b6a6471540901bfacdbfe2f76e68fdea2d1caa509f57216d4bb4f214cee7008380d5f60643e1a3a6b
 DIST SQL-Abstract-2.000001.tar.gz 134560 BLAKE2B 30ecaf25dfa5cf6c7623c21d0ab6990de9a2b3f2139247402ba2a2b5eeb4c1a66ff369c6e4a364760fba106e0073af995212b3093aa4990d769b0f454b6b904d SHA512 a4cae42a261b64ba7c44bf6cc196f135ab32e847352572aafccee04dfdd5fe83d8b7654702acd90908cd0e90f6730cfc4fcfa8ffa81d52de7a18e38a2d6ea5d8
-EBUILD SQL-Abstract-1.840.0.ebuild 793 BLAKE2B 7ce46a37eda940405757d66bad9078f5c9bae0e4d5375cdc495efebe1680eb1fce951f05baaf7038fdf3345d51124a593bff81eb350426e50fa3e2531c8ae2b9 SHA512 166053d26b39fc4e4f6337470311a2332c30054e2db3647dd1b90214b35985dea892e5d420e4d5088a5eb82c79b59cb254a24edc607358a2ba0b65fa1de067e9
 EBUILD SQL-Abstract-2.0.1.ebuild 790 BLAKE2B 880ec96baded770f0526f8b4bbcb7856f5ab169148c543d9f7d8e2e951e020298e1c4c2391570ddc3899b6144a8775e5b5b086ef165de40969320b687ad33b0d SHA512 9afe88b400806b945e5aec233dbf7bfeed6dc11627013bad44cdd41bfee245eae5c1d0b26a78c45b5d86aa658b475cc9578d3a428bfd5004b7d229d314691675
 MISC metadata.xml 616 BLAKE2B 57a84ed520512bcc7d7b8d66d90d9f8fc1b141b3ed41d62d3c9ec183a8ac24cb221ca89bad04bbcad15da26f66f66534be5fa633babb47090a6a66f508076efb SHA512 58f4e9cd64e0d069c8e67c5d8dc1ad1c25096d5db6a2f0b66d62bc33338f6540b40894ce96d80c3beb78705a83ed88749a0ae3761177dc16dc7b6f996a74f79f
diff --git a/dev-perl/SQL-Abstract/SQL-Abstract-1.840.0.ebuild b/dev-perl/SQL-Abstract/SQL-Abstract-1.840.0.ebuild
deleted file mode 100644
index 8dfa4118d96c..000000000000
--- a/dev-perl/SQL-Abstract/SQL-Abstract-1.840.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ILMARI
-DIST_VERSION=1.84
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Generate SQL from Perl data structures"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	>=dev-perl/Hash-Merge-0.120.0
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/MRO-Compat-0.120.0
-	>=dev-perl/Moo-2.0.1
-	>=dev-perl/Sub-Quote-2.0.1
-	>=virtual/perl-Text-Balanced-2.0.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Storable
-		>=dev-perl/Test-Deep-0.101.0
-		>=dev-perl/Test-Exception-0.310.0
-		>=virtual/perl-Test-Simple-0.880.0
-		dev-perl/Test-Warn
-	)
-"
diff --git a/dev-perl/SQL-Statement/Manifest b/dev-perl/SQL-Statement/Manifest
index 0239480e710f..94f624eefa9d 100644
--- a/dev-perl/SQL-Statement/Manifest
+++ b/dev-perl/SQL-Statement/Manifest
@@ -1,5 +1,3 @@
-DIST SQL-Statement-1.412.tar.gz 154608 BLAKE2B 67f967f34b1cf6b987617dc555f867f3f5eaecdfb8eb6e3f27a3466c93b610cd7a100ac486c295120ee476d933e044aa4ad7f138e5f09238fa9ce87e50b0b65c SHA512 73b65cd3d1b1be2ba1e80e2cbdd2aae0aa79a23252f28caf3c3a91c78f31c2f2d698e91ae474d44efc02f608a0ca042bf47cc4e76832864b49c590f54687e3fa
 DIST SQL-Statement-1.414.tar.gz 159512 BLAKE2B 7f0e131a56f3aae7fcd12e3a208452e572314555fc5759e533b4197467e42a2ca0e34fb75e3eb98689b04bb96b02a4bae5673e91f826af7962fbebd880c5942b SHA512 c8a9e93979d3f775b1e8981fff0cb958791f0a513432133bd376a20eca73da27c40d2dd74b27f3f8f7d326897e3a8b776053080eff40221fd525f546bf474c5b
-EBUILD SQL-Statement-1.412.0.ebuild 948 BLAKE2B ce1901ed9d59badef15089ce91e700ed9d9dc69a67cd14ffc8b61d3ec6b8f72ae23cbefac99e3dbda55cf9aa8dd5fe34dd743c0544fe24519fafc07333865613 SHA512 38b05f2c17250c75ea0050fa644a90a89973bf97e932f2a4a571f47dace4dc8a557e93c29960a61a4dcd9c51e41de8a0dd42c858b8d7753b92bc9605e38d6c0e
 EBUILD SQL-Statement-1.414.0.ebuild 924 BLAKE2B fd4034084f9e87d03bde361dcb8d84c024946f74db12dda0ac72514cddd9bd082a9ea44c74c193e9742bfe2c98e1e748cb64a106ff7e88cc42545ece4df32601 SHA512 0b3e7722599e148a1aecd6d698985325d54203a855eea8d6954e4ac9bc75eff8bc0b19e39fc2bf00adb7a78f86afd2623921f8f79b8e54061828298ca2db018c
 MISC metadata.xml 4179 BLAKE2B c03ce8c60a6380137c96e24b544363ac8bf14af5c63099f6257839d60bb9af639b5b7b76b44ba29a2ea1bb9b242d2f7205b7bc548e846d51064fd6104a9a0ce3 SHA512 474112ea82cd9e4df23785b063e015c17736728b908622d5e1fbe959881e4a538064cbcaeddf2f498c77f2c3b957db76ad57909cc7f1392f7d8293282acffae2
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.412.0.ebuild b/dev-perl/SQL-Statement/SQL-Statement-1.412.0.ebuild
deleted file mode 100644
index a675cfc633eb..000000000000
--- a/dev-perl/SQL-Statement/SQL-Statement-1.412.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=6
-
-DIST_AUTHOR=REHSACK
-DIST_VERSION=1.412
-inherit perl-module
-
-DESCRIPTION="Small SQL parser and engine"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!minimal? (
-		dev-perl/Math-Base-Convert
-		>=virtual/perl-Math-Complex-1.560.0
-		>=dev-perl/Text-Soundex-3.40.0
-	)
-	virtual/perl-Carp
-	>=dev-perl/Clone-0.300.0
-	virtual/perl-Data-Dumper
-	dev-perl/Module-Runtime
-	>=dev-perl/Params-Util-1.0.0
-	>=virtual/perl-Scalar-List-Utils-1.0.0
-	virtual/perl-Text-Balanced
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Math-Base-Convert
-		>=virtual/perl-Math-Complex-1.560.0
-		dev-perl/Test-Deep
-		>=virtual/perl-Test-Simple-0.900.0
-		>=dev-perl/Text-Soundex-3.40.0
-	)
-"
diff --git a/dev-perl/SQL-Translator/Manifest b/dev-perl/SQL-Translator/Manifest
index 3d37b0caddec..cba6ff2c60e5 100644
--- a/dev-perl/SQL-Translator/Manifest
+++ b/dev-perl/SQL-Translator/Manifest
@@ -1,5 +1,3 @@
-DIST SQL-Translator-0.11023.tar.gz 436852 BLAKE2B 62fe969cfe93bb0cecb59d1690a0a13b54b5e46db5d20479da2a37c8b459a96021081f7bcbac998c40baf459306cea27bcadb9dcd7a0e99a0686b1134c7a4af4 SHA512 95ae982c504b464f988b8bc04f8e733053978bbbeb532cc86ffb90485823403d403ee86ff562b591b1b82bf99bcfa357385eb6690e5c06c968dbde5653afb4dc
 DIST SQL-Translator-1.62.tar.gz 411750 BLAKE2B 725391697feb7581944222965cb9e951251ff101f1236c1b8406c455cbed13a5cd5c09b66770358b3e1015f25d9e4a3ea624fd913c762fdf737187581f455a83 SHA512 80096bf42cff406b896d96fd4374cb69c4bbe6ce037d58bb520d5c8ac31a15454772217730fac4249960cd81ac02ff9b5419b8dc80fd0a0901802e525ff863c8
-EBUILD SQL-Translator-0.110.230.ebuild 999 BLAKE2B 8727f49742ce422f8f6c3a7fd8ab19e22d8373b2fa025959d7bbeb74d56f6e50441dcdf837221ca7c8bc1c9eb1542856b1880dd37b9f98b7805c5d332df0a69b SHA512 926cfa636d0b61a02b0c84fd713c4287880682f71771ed18190a578b26053888e6813a5af2b6d79e03fb873068dc4f70a912b55dc8cdeb9d7384a6d356e4bd24
 EBUILD SQL-Translator-1.620.0.ebuild 887 BLAKE2B caa73f3a535f8f970feec2629ce13e4b42438c6ff8e7d13c699e052fb28a90fb2c99e795930230ffae08c9d009da0c430a76e2d8612a4dbaab44413970ad7b6e SHA512 a05aa42e6a3b2f42193ee1d14a91ecbb3b0842e789e800286db93437632267534dc2005667ce06268d53144c84919d81226f67300de3edaf0f3ee6df064cbb0e
 MISC metadata.xml 6774 BLAKE2B d093abdd30e2da7d8f48530f5e43d99c457193cea448f7f9a0250e6b6f5580a815e1e31db4c8ebfbffc82b218a3c3518df25afec0c0d01c5d71d675dd4983699 SHA512 9a2e1457ef86bf9c54237c8b0c485e494aa28b3280dc65d44642232b76de7499ec567937ccd4535fbf50bb91fe2efb7099fb2effe159c94976187984ad0d4a2c
diff --git a/dev-perl/SQL-Translator/SQL-Translator-0.110.230.ebuild b/dev-perl/SQL-Translator/SQL-Translator-0.110.230.ebuild
deleted file mode 100644
index cfc007885783..000000000000
--- a/dev-perl/SQL-Translator/SQL-Translator-0.110.230.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ILMARI
-DIST_VERSION=0.11023
-inherit perl-module
-
-DESCRIPTION="Manipulate structured data definitions (SQL and more)"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Carp-Clan
-	>=dev-perl/DBI-1.540.0
-	virtual/perl-Digest-SHA
-	>=dev-perl/File-ShareDir-1.0.0
-	>=dev-perl/Moo-1.0.3
-	>=dev-perl/Package-Variant-1.1.1
-	>=dev-perl/Parse-RecDescent-1.967.9
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Sub-Quote
-	>=dev-perl/Try-Tiny-0.40.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	>=dev-perl/JSON-2
-	>=dev-perl/XML-Writer-0.500.0
-	>=dev-perl/YAML-0.660.0
-	test? (
-		dev-perl/HTML-Parser
-		>=dev-perl/Spreadsheet-ParseExcel-0.410.0
-		>=dev-perl/Template-Toolkit-2.200.0
-		dev-perl/Test-Exception
-		>=dev-perl/Test-Differences-0.310.0
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/XML-LibXML-1.690.0
-	)
-"
diff --git a/dev-perl/Spreadsheet-XLSX/Manifest b/dev-perl/Spreadsheet-XLSX/Manifest
index 41fd1b7082ae..2626a7e9bc39 100644
--- a/dev-perl/Spreadsheet-XLSX/Manifest
+++ b/dev-perl/Spreadsheet-XLSX/Manifest
@@ -1,3 +1,5 @@
 DIST Spreadsheet-XLSX-0.16.tar.gz 73391 BLAKE2B 9b3e81f14ccdb336fef86d2ac8f951eb8cb167623b1078776a8ec3be15a9ff059b8f8f9d3f39ba0d6ac85e5554af292aa9e4a485cf5c925b9379995eaf0e162a SHA512 ae7b52dcbd43cabd380b7cf2f13afb29c74ac9fac4377e49c2b259f6d2e932b0712dde2a110bb2a4f27728e59bd9dba0320209750a57c9d57a0af38d0802a699
+DIST Spreadsheet-XLSX-0.17.tar.gz 79947 BLAKE2B 447b450c49b4ec795f653936aca10410b26858266a5fc47e4ddab543b0c0cb7821254f4e6aab3b71ba1f9bfa30a64ff84e10b4e00610f74e12f102edfee3fa62 SHA512 a59b7649cdc6a2cefc0bae7cc2f713611b1a5715895a4ca58dd374920fd876c34e5fae5b892c30fdc2a29c72c84f8bfe0e9d80405556bbeb050450e24d41d8ed
 EBUILD Spreadsheet-XLSX-0.160.0.ebuild 450 BLAKE2B 40c31e11e864791265b1bc57663f9cef97ae95edfa96e664abb0eaf664d3b9ebd01722fd7ce52b7046af1f02515d64d432b40a44016251cac8e41e9981b3c574 SHA512 aa303b379ec78e316c8541990e5fdd527a3d38f4fad41f6da349244f6dc45c44c531e2b59b6a2666a8d05c50dabf39190d004c3d7d2fe2e81679d804e5a11522
+EBUILD Spreadsheet-XLSX-0.170.0.ebuild 478 BLAKE2B 8625bcf2e554233373bc4cd537c225a71094526df2ed87bf6e0f8acc4f000d4206e055113f788224535dc3a6b4f8aad9b6771b2a899cf305412f1ee94f3c578e SHA512 f8c7c8b7ecb88b18a20dba316b73fa441514133b9d68c5abc0e4499403969441c1470f1ca5da8882fd8e46bf987d485a648b062821b6139bf6d94782164ae7db
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild b/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild
new file mode 100644
index 000000000000..81b1320fe2c8
--- /dev/null
+++ b/dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ASB
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Perl extension for reading MS Excel 2007 files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-perl/Archive-Zip-1.180.0
+	dev-perl/Spreadsheet-ParseExcel
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-NoWarnings
+		dev-perl/Test-Warnings
+	)
+"
diff --git a/dev-perl/Statistics-Descriptive-Discrete/Manifest b/dev-perl/Statistics-Descriptive-Discrete/Manifest
index f45a79ecd5b7..e3872e16d75d 100644
--- a/dev-perl/Statistics-Descriptive-Discrete/Manifest
+++ b/dev-perl/Statistics-Descriptive-Discrete/Manifest
@@ -1,5 +1,3 @@
-DIST Statistics-Descriptive-Discrete-0.07.tar.gz 6889 BLAKE2B 73e89cdff3d5e70fe95a579c382a73a7fcef3330345cfbd996a22e25992d88372c9c0d1702a82718ba7e2027a8e518d139ac42a60955cf959bd1ac6c9e9ab6c5 SHA512 a751b25efbf352102af841e0b46966f70a003256167b4f8e281520c971c9aa9c9c87d8f8194febc24f740feb75a61072f80f7bd1d28b6d9d41f5d198b46177a8
 DIST Statistics-Descriptive-Discrete-0.12.tar.gz 25644 BLAKE2B a8ec97bff330d8f0946d294d7ff0277b10d0828c6aa0211c78eaf8eb161b14631d6162f1ac624da5fab43b1e54ba3b6ccda0cbc3941fa21be07b9c25f8ff591c SHA512 08cef28f5111132eb7a7c11e6f63eae4acf2085cbabe279e9a20f06ca3154c9c63f9133429f249cdf16ad347398cd124c34ef827c6f03fc093b2b00b3ab6df08
 EBUILD Statistics-Descriptive-Discrete-0.120.0.ebuild 282 BLAKE2B a57f92b724a6d62559a2ba060e2fd4c17b55036b907ea8b22ead0c9ff5c30848a503d45577cf53d714b93ea881095d595923c9d198e0f0b020afe718d7dc16f2 SHA512 12da9ebc5556afb1c8fbe87b03eb9a441e81bd475687c772e35ef115fa49592dddb1e96e95606c3444563a7117d38237997f0779fa07687f36488d4a5d33d5f1
-EBUILD Statistics-Descriptive-Discrete-0.70.0-r1.ebuild 307 BLAKE2B c619fd2d4a0eb162a7e3b15b52d33513ea14d2776c4f055131f8a6e37b845fc51f1e41c1ee34378214ae8635dbd1e60c0d592076a817774879a3f1f9101a2f08 SHA512 a839ca33c9df570cd9f62d370df81f03f447e72b1e0e86492b8fffb33d694f0b4b9896874624b1db07b88af23f6e9f059b08768f69d21c40a3bdb2b9adbb0709
 MISC metadata.xml 436 BLAKE2B c59d37d61e1b0d8110b18ede370482ec00437547b9c190c35e55d036970bd77cdba3617aec7df67189e9011a08fb004ec01f03d9c367016e9919e5aa8f86d529 SHA512 3ecccdb5960af9bb982d2b539aa185f76ad91d76614c02714eaa4e2cde8f2b4fceecd040f8af04cebdcc9026c07f1a0a51a6b2ecfb2d64e6789119f913e26301
diff --git a/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.70.0-r1.ebuild b/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.70.0-r1.ebuild
deleted file mode 100644
index d6b14cff2dbc..000000000000
--- a/dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.70.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RHETTBULL
-MODULE_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="Statistics-Descriptive-Discrete module"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Statistics-Descriptive/Manifest b/dev-perl/Statistics-Descriptive/Manifest
index af7b531a7097..c1b3f5139d9b 100644
--- a/dev-perl/Statistics-Descriptive/Manifest
+++ b/dev-perl/Statistics-Descriptive/Manifest
@@ -1,5 +1,3 @@
-DIST Statistics-Descriptive-3.0612.tar.gz 45929 BLAKE2B db9fd041f1182ac780ec2b803cd8377e04f56a9596da5d7e791a3f0b2f40490333e4f7844356b72464bf1c2169a689f3862306621546cdf4422732129e992eca SHA512 1157c0259a376f44363861c515ef56a25cf5a496d67faea546e225751d39c3529f9aa7d1bd021e2e399d5e884e7f5372df67249fe4f5607a6bdd806235503d46
 DIST Statistics-Descriptive-3.0800.tar.gz 53611 BLAKE2B efefcffbb83b153d7211756b30e5e00447f3aaec768f4849601f3c5b83c4ca60cdb56f15c5ff95f2fff23045764fef31e813b961a8e886506da1d71983ae6f8d SHA512 691a99aca4214149d14c770d71b5d97eaefa2690698b0234b11ed33d7bdbc21e9b478941bb8fa46886ea3362f432eb744a3a3b3607f3d3fe189c4256884efdec
-EBUILD Statistics-Descriptive-3.61.200.ebuild 789 BLAKE2B 269338a9caa1775bf5e9e399725c99ba673ad8eec049ce819ef1f40d47ec492c6dca603cfeb7d5b03b14dab3dd02442dbb23e1c7c7e1fb6f387f4c91256105d1 SHA512 2544784c7ed67b3695fe5d5a7aa7791a727a2105871c416663da3fe7274a512aed0c59e280c214e1d99ff91a5d524a37e6fdbb5f2aa7c7d2e6d5293786db80bd
 EBUILD Statistics-Descriptive-3.80.0.ebuild 637 BLAKE2B bdb5ce8638366c54f4521ea18fdb4bc700f96106c7ceec5e639b6bd442519e60935078d24b5409601aac712bb8019942d2637a6191f4948dd31b3de5c6cb4635 SHA512 e4c4fde3b71c05b908ee19329cc1a9f070d63b3de823867a21709995b669a8e34e321e136612c5c5ba43c84c44df0692ea26ff8e5629e1e949c7f402c4ec6717
 MISC metadata.xml 845 BLAKE2B 4d8b72fd597e6308bfb0629dac49e5034a0801dbef47585001d3c09ee4fe29daffe5113ebd29b1132f8e5b599cce85bf838f9bac545e42cfa4d236b00e9c2f59 SHA512 c747b161d7b32ff9df1124dc4fe963c7ae9209c9f8a6a1296968fe9344ec510ca3d97df94cbb9351fb8b034fcc6b9c85db9f8c3df693bf395b095274fb69daf9
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
deleted file mode 100644
index 5e3331b9688b..000000000000
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SHLOMIF
-DIST_VERSION=3.0612
-inherit perl-module
-
-DESCRIPTION="Module of basic descriptive statistical functions"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test examples"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/List-MoreUtils
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.360.0
-	test? ( virtual/perl-Test-Simple )
-"
-mydoc="UserSurvey.txt"
-
-src_test() {
-	perl_rm_files "t/pod-coverage.t" "t/pod.t" "t/cpan-changes.t" "t/style-trailing-space.t"
-	perl-module_src_test
-}
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -r examples
-	fi
-}
diff --git a/dev-perl/String-CRC32/Manifest b/dev-perl/String-CRC32/Manifest
index 4a0efbfa5457..8187e768c0bf 100644
--- a/dev-perl/String-CRC32/Manifest
+++ b/dev-perl/String-CRC32/Manifest
@@ -1,5 +1,3 @@
-DIST String-CRC32-1.6.tar.gz 7713 BLAKE2B 9b976be73e7781beccada0c2c0bf535f5d23ada71840fce82f1915bbf0f2c5ddeb9d4ec50b89e396b9ef373826961fc4f78e9a0e5df38823a482d939bf35e769 SHA512 e8915066edca5407de5c42cf6ec6367cfc8662d3c353ee7b9150e372fccbca136946a8e30ec18f4ccba3a08d4864387f3cad01b3b0117e019927b72c9081fe39
 DIST String-CRC32-2.100.tar.gz 7995 BLAKE2B a8434dd8817ae93853cc2fb5fe41b4c86072d2382b1d7e9c94cef6bd9af405c0f2dd333e15a343449c9258505ca7af194e5ffaddf466677ff2378061915656cd SHA512 24e5f69aa02b16c888fa412afd28f907756e344662d66d05759ed212d97ce3f0a05fbf5bdd1137bc31ae37e27d0778fe23d75def368e051ab1cbc4b90c96907d
-EBUILD String-CRC32-1.600.0.ebuild 410 BLAKE2B 718502a596fb2145b7d3c71a63ea61673b675aef11df1e83114d63c6f589c8ed4f5c00c784fac3a8157f4e6d2b564aae9a02709feacaa8f9658f5e3314ad084c SHA512 5f378015a0acb6ec9d7f6b11b4a5302c17336a793b477d28fbc58392e7a5af860b1774ee99143180ffd4f38f786b1949aeb565def8abaaa64943576b3f1af777
 EBUILD String-CRC32-2.100.0.ebuild 404 BLAKE2B 562980b8f4fe1842f4f089ab9f15c7ec2462cacc4eb3a05ab3643b6471d2c9f36c1abcafd1c85c3483c4744ca9d8157bf0ec3f0e427f3cf36a4541be8135e68d SHA512 8fc1297bd704fa36e99c26e09d74bf05323648e45545057c304bc0fb47c348204e4b2026a6814a1d5528185759b6772b3066297b2764e5531b919bfb4c684169
 MISC metadata.xml 397 BLAKE2B 05638284366cbd6e623f971311b1a64e3672c8ebfdb689852963f964da1a4bfbfa7d2301153bbb6fa5111d05c231e4a55c6d9133a6d8096b551bafe6439478c5 SHA512 6e7d3759d692e63e34bc19739653e705c5dccdcf3f4be84d2971594b94c1794d3453031bc72d4c4bcaff40e7164ac0afeb6c11023602ba3bd7cda26c1ea25d54
diff --git a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
deleted file mode 100644
index d15024e09a71..000000000000
--- a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=LEEJO
-DIST_VERSION=1.6
-inherit perl-module
-
-DESCRIPTION="Perl interface for cyclic redundancy check generation"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
diff --git a/dev-perl/String-Ediff/Manifest b/dev-perl/String-Ediff/Manifest
index 96e651c82896..27b09e1528dc 100644
--- a/dev-perl/String-Ediff/Manifest
+++ b/dev-perl/String-Ediff/Manifest
@@ -1,5 +1,4 @@
 DIST String-Ediff-0.09.tar.gz 13195 BLAKE2B 1f5011e452278e3b62a840e61d609f689e4886f0b6d83568257d9d2d924aee39790405c92b4425b8a3a02a8dba500a7ff4dd427e1f155dc15f18a2a2284fa5cb SHA512 865723e47c570d38d180a05ad890d86228368bc381722764dd5e785b13be6c06904221c3ebb7ab583f9e8b9974067b0920a3d8710dddb77015eecd2059d763ec
 DIST String-Ediff-0.90.0-swig.patch.xz 17600 BLAKE2B e3e3808f38a9af8316974975872c3e74f15e54484cdc7f10f42ba2411fa80f8a7367f5097f6aca52c12761965dd7c9f3054e2aa7931796a3b264262ee7b150ae SHA512 acf53641828dd0a3aa60806cb36e5b6ee5724ac9c5a969aa11e0b9bd298b79d6b51864188c4f6403909b9efccb3e2d55e15a201f7d3ddbba04acb0224630ab1c
-EBUILD String-Ediff-0.90.0-r2.ebuild 290 BLAKE2B 7acd54552718c119cb7489a3b86603c98a0d8073dfeb46c85d650fbf833ea866cf777a09d58f210a2550d02ec0b04f7fb73da0037d9a6f1ff0e9084d4c2232d4 SHA512 591ca06a1da0b75c1022049940fc64c2cf7b281dfcfcb20481f49a17158c012dd411aa09880ebb2fda2e50e4a7b9f73da71dc8812f327c65ddf49c152dc5b4e1
 EBUILD String-Ediff-0.90.0-r3.ebuild 408 BLAKE2B c235fcd18abdbe5f5976c76c7235c10d35e31d8400c2bd87a2273fcefddfa06f10fcfe1ca82f3696b771e892b286660d79f40786494d0b4999b42d31b3dfce91 SHA512 b5e27ebb959d856bbe55d48507dba25f6b08aca7b9dc641c9ccecd5693f15e9919d5bdc2f5118c13d505c71773beda066714cac4ec646a7886e6b1d77ad11b3e
 MISC metadata.xml 397 BLAKE2B 00405bdd90c972a67c63f91f88083f7cdde6ab7ed774922513aa5aee3784572fb1c38969ec9f51c90acd5877ea074a7acebe79925683ab75b57432298630780e SHA512 7a6e1c377a7539a60938875c216cafe03e596a7d046a958e77b7bd98264a44ee39a67f368e999286238924ee6da3b2febfd4a5381a64c5a12690bdb194334e89
diff --git a/dev-perl/String-Ediff/String-Ediff-0.90.0-r2.ebuild b/dev-perl/String-Ediff/String-Ediff-0.90.0-r2.ebuild
deleted file mode 100644
index abe95de7c858..000000000000
--- a/dev-perl/String-Ediff/String-Ediff-0.90.0-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=BOXZOU
-DIST_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Produce common sub-string indices for two strings"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86"
diff --git a/dev-perl/String-Formatter/Manifest b/dev-perl/String-Formatter/Manifest
index 764d054ff032..6ad7f32a5040 100644
--- a/dev-perl/String-Formatter/Manifest
+++ b/dev-perl/String-Formatter/Manifest
@@ -1,3 +1,5 @@
 DIST String-Formatter-0.102084.tar.gz 20981 BLAKE2B 960a9ee9ef5ac6d378406697d16ab44c891d959d6f6aa888b8b0950b178d9167b8882d372fd86271a69f51a85a243b8ab491d8b21f3cfdb4ad47d7577aef282c SHA512 d9e72e01b78d9b571cde6cb0107e334e41739b07006e224016cff5de4648b9f924003446de75ddfd911bfc25b3046554cde09502344dce53a8fed2ecfd7994dc
+DIST String-Formatter-1.234.tar.gz 26321 BLAKE2B 65442a35e9ba202fe9105f3d7d03106eb1057344f8cd8db4b321301477c999a7259925fd4e7b8e88c0ac82e4d09aa18bde0c0af7542c4ddf4d1fbeddcdc0ff13 SHA512 be5fb27182437c0e89e02d53d6c931eac614634cdd6c287109779afe1e305728ce9b0807e54c018bd68e4554fe02f2722586e8cf61de477bcb79b69db3ad55dc
 EBUILD String-Formatter-0.102.84-r1.ebuild 517 BLAKE2B 56564e892cb32eb97c431a32ba37c517f656864e211e6964f81a948d3ac88327193e537551844a6405ecae6c2110608b3a9586d1aa6b8fa6f6953b9229dfac04 SHA512 81e2e0adfef1492b5162d92288e1588a787fa602ae019586a7646c18b58c3901e2d6eaa5689a1c556e7634b009fbeea51ad36c7263af622db5f2179e940a478b
+EBUILD String-Formatter-1.234.0.ebuild 432 BLAKE2B 981a8ad40a4790afecabd169929fb8a9bb4b05184599f3a86c1645dd02db5b54609a4aa0f3f29e61729d57ea493705342a5ab01abfe8ccdaf6da61f957941b8a SHA512 aff1ba2544bbfec246c986aa6a59c5a16f8c3f8cee9b2bbb9c12ec68c2b11cacc10b421ff4c5d69fba146b72e77b15909c651888ab79f77be063019a8f76ec43
 MISC metadata.xml 479 BLAKE2B d8e304fe5f93e7f8a4d2d2c4a82f54c4821a6b8d703c53ffbe91f5f1e504431a4cd8a6a9f71d518e2faa17244d423cb296a2e17287a41771c02d112a4d920666 SHA512 6235e569fc9a5d1b32de2eca49006917a4005b2c2f7fdf8d8a94e9271be0f1791c92712c569f32446a1957494d09f25c9dac34fc2380bbdd4377951d7a28ad3d
diff --git a/dev-perl/String-Formatter/String-Formatter-1.234.0.ebuild b/dev-perl/String-Formatter/String-Formatter-1.234.0.ebuild
new file mode 100644
index 000000000000..fd967bfec86c
--- /dev/null
+++ b/dev-perl/String-Formatter/String-Formatter-1.234.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=1.234
+inherit perl-module
+
+DESCRIPTION="build sprintf-like functions of your own"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Params-Util
+	dev-perl/Sub-Exporter
+"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.780.0
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Sys-CPU/Manifest b/dev-perl/Sys-CPU/Manifest
index 78518952d253..f8fb41cd4539 100644
--- a/dev-perl/Sys-CPU/Manifest
+++ b/dev-perl/Sys-CPU/Manifest
@@ -1,4 +1,5 @@
+AUX Sys-CPU-0.610.0-musl-unistd-h.patch 299 BLAKE2B 8ba7bc9f0d663afd91a581f42859981cad5296bc38baed72461139b0ad0784b8d296b74fe3e9cac9180b91b3e2788bc25eb16de374dd0d1a2f3686e79b4fc0de SHA512 84933432b4599bb635617fcc5be16bc8122eb6f240a0765b87ebeb0dbfee6b58b889dc6b7dc54e36b0db1767839a1f6342813a2063a73db7c152c1ad646417bd
 DIST Sys-CPU-0.61.tar.gz 6497 BLAKE2B c425b80a241a8493b1812efe01108d4d15ddd386993591960d80e73edb28f21453fff842b7f8bf4c5c999908eac383925ceaaa413da407d6559cb205d7650226 SHA512 391e113c87d9044cd43c47f9f78a782fab65566a32c028c01f7f3335a5065b6755586ea3143356510c8d28a7d1ad572cc6203ec189eaaa379967bdbd0a0bd7bc
-EBUILD Sys-CPU-0.610.0-r1.ebuild 323 BLAKE2B b7d2e74ec09144fd08121a987e2192a98a5844ed7097af9b866c5a4792ddac2551751c8582fccb41946e9707cdf43c893a0b428bf1c2ee3eecaba747a2255f5c SHA512 6daa13fcaf8ef7cf8ee50c1b524ae2db78e5e00848364c0699600c0adf3a6029349bc964cf75bf9004389739461c27654a65f5ded56160d231b6f539ba2357d5
+EBUILD Sys-CPU-0.610.0-r1.ebuild 385 BLAKE2B 6f2d549423df18c351c24b8bee68e7804d05b009f2f8bbe6fd6ca369608a537c903a3406be8a7a43bd108e32be9c49b465472737a0be0105aa410f6d4ccc5b1d SHA512 a147cc8c6aaf54f13631c23baaae7fd18faf4961854d25542a7d1bc6f4d0714b890117b1e4403e6fac8992ecb5ecd7d1fcba633fcfda5a6bdf59c9a7cc830f0a
 EBUILD Sys-CPU-0.610.0.ebuild 327 BLAKE2B 909a91c926305fe20482a759a3ff3dce9563127cd055e04b4d07cd142ae451531bc9d57fc370383ef6ef1610f856855dea4b2afa1205e2df1f13193139f33d7a SHA512 65d8209ad26eefd8121415ff7f8aa83173fd89e1dd38b0502b72a9ccbb5cea645373f1a47a92b1ecb5dd9165c4dace7d7c6c865710461e6ed8507654efa1a961
 MISC metadata.xml 387 BLAKE2B 06cb594bb16db890c5e4f1176833de1780029e33740a2e64b066b286428b404a2a7bd74d5d0a4c863b644c208f4ee00fae193026c63183d5c6feeec8edbcca3a SHA512 990c41d9a7797f3faa2d9f943a3e6c2f2f4dc52d2796f181588fedf45884de2d7ad08182839cdf01d27292ec1d6289520848125d1c6fab52aa7f04d932da4bb1
diff --git a/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild b/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
index b505b8d0799e..651d74be91ea 100644
--- a/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
+++ b/dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,3 +12,7 @@ DESCRIPTION="Access CPU info. number, etc on Win and UNIX"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.610.0-musl-unistd-h.patch
+)
diff --git a/dev-perl/Sys-CPU/files/Sys-CPU-0.610.0-musl-unistd-h.patch b/dev-perl/Sys-CPU/files/Sys-CPU-0.610.0-musl-unistd-h.patch
new file mode 100644
index 000000000000..346677fe9fef
--- /dev/null
+++ b/dev-perl/Sys-CPU/files/Sys-CPU-0.610.0-musl-unistd-h.patch
@@ -0,0 +1,11 @@
+This header doesn't exist on musl and it's unnecessary anyway.
+--- a/CPU.xs
++++ b/CPU.xs
+@@ -24,7 +24,6 @@
+  #include <winreg.h>
+ #else                /* other (try unix) */
+  #include <unistd.h>
+- #include <sys/unistd.h>
+ #endif
+ #if defined(__sun) || defined(__sun__)
+  #include <sys/processor.h>
diff --git a/dev-perl/Template-Toolkit/Manifest b/dev-perl/Template-Toolkit/Manifest
index a676404ec756..4a88652790e2 100644
--- a/dev-perl/Template-Toolkit/Manifest
+++ b/dev-perl/Template-Toolkit/Manifest
@@ -3,5 +3,5 @@ AUX Template-Toolkit-2.27-no-dot-inc.patch 1987 BLAKE2B feaae674dd01ef2d7ae7c1a6
 DIST Template-Toolkit-2.27.tar.gz 511172 BLAKE2B 62ffce1fe5679799afff6b3865882c91e70efeb2ec14474f3b49bdf35bd64f7ce4439d5c58ddd73bad26589816d2f24f4691a02c69405fb6b6b604d28edee4e2 SHA512 17f03a01a3d6ab0ef2247c77da15c46d9bbce3e0158172162da6abe47f53c5e7ca041a7c31506bb3a37f31c476ba747f5111c5b1b1d69614a4ce3352927fd4e6
 DIST Template-Toolkit-3.009.tar.gz 523388 BLAKE2B b33569ef066d6896861f84299c36802fac81e48ff71460ea6acc41ca39e78cd5a37fecac4c5603077395a448a872b10b8c801eee1491b3da7d00479f70c337ed SHA512 940992d7e3059a64c273c2f0441a81e095560c35f4bb9ab75afb9eeeb58d043cc5ac9785e2eb79a6635480ade12771c75c632c755977124dbe7cbfae399f9972
 EBUILD Template-Toolkit-2.270.0-r1.ebuild 1087 BLAKE2B 1ca4420ef207511b843593d7bf1e93c2ee4ac916503ca34b98db1c6adca50c96e3f55820929338424f2f2f88492ab5ec69fe44bcfa98815635227022d4293ed7 SHA512 2c8524c267ef482918672f9d1c227023efead9a5638721568f5a155f38f231c70941a849c45e7fac8e3aa1c2302ce404ff6fbf23be5f9c7b2e0a4fac2965312d
-EBUILD Template-Toolkit-3.9.0.ebuild 1048 BLAKE2B 0a79192e78ecb60b2ab456b30163607e9ff0be1a9c06af235225e272a46f079eaeb3b4b7ea82ccf496befd3179cad5c5a62e25c64ccf5343d6e13ffaca2ab449 SHA512 2f45fb443ff9b1be27b5dbb00a78d0537e99280b418af6aaecbc8308ad6fdf7de582f619e2e3736cb7de77bf69a4a1e7560af54ea14e5caedfe13fb16dda44b3
+EBUILD Template-Toolkit-3.9.0.ebuild 1047 BLAKE2B d9b62bdc860a6ac00069c09206d48253e7383d63319904872246e36572927b67dc309a9600fbdbcacf79702ab3aefbc07669f99fddfe255092941c1c2426f14d SHA512 2d6a6335379b04bc34d275532ff78a824c7914cf866ffd612101b64d927afde014158733fd0dfc40ceddbb3fb1956f914d3ae09b3326977f59ea5ac9879ea4e1
 MISC metadata.xml 3835 BLAKE2B c935c76b9dd434401a096c28de95f24e252d9f327a80ff5f4ecc8fdd16bbc97fe6d365ef7df458810774cdc3a21786d68c6fa148ccea8dea890f53f200d7b69a SHA512 e8cf3c46df8dbf266bb0574aa6f1d670b7fcf3ae4e40c78f6c971ccebcf255af708698e7ffc6a69f5955a6cda8c655f3527940956923d2f5a1ba29df61b176f8
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
index 2f2e0682554f..07001138331c 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="xml gd mysql postgres latex vim-syntax test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Trap/Manifest b/dev-perl/Test-Trap/Manifest
index e71a6c31b744..e3efe4edbfa7 100644
--- a/dev-perl/Test-Trap/Manifest
+++ b/dev-perl/Test-Trap/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Trap-v0.3.3.tar.gz 55053 BLAKE2B 5e55cfa802b018b68c3adb856d6622d5e625fff0b2c35563debb33a2e14b20f81e108a0d9025d6716fe9d784286821340cd4ad830697efd092e2bdf261f37311 SHA512 3a79bb0e201f2c740ea87baffda29141fc41e29b310bc9291da0e1cac0cf7f62a8c5cc70b94b68542cac7d6844d76c7fc1d3bbb91d86f8ba26a489d39883dd1e
 DIST Test-Trap-v0.3.4.tar.gz 55339 BLAKE2B 67200b2852786284e7c7200d0611e025cf39c1329a7e1fb51908ca02c36c85f991a3b0e437e87126ebede507ae5f00df37085da542d457eb481cd2c083533596 SHA512 cac4412a55511c820a1813a277afa802769a64219bf306190d83fea775c53bcd1d7faa275cb7f1b435e5ae274b6c1f78dd862525a6426040e51fdaf537e720ff
 EBUILD Test-Trap-0.3.3.ebuild 655 BLAKE2B 827bac6b6d9e38c6bbcbfb1e97a960878888b30faab214499eacd68e53754140acf73ea94ceea629ec57613a00f3e91c191a33cb02e963e77cf054a7667e9469 SHA512 0a723ab82d896c80cb70c0ef5ff25c8294a7b24b18dfa66ba6855204cccf336bfb44c0f0f59dcd15f2f5c4983c1c63daf13985d603abb9ccfbb8a8c3d9dfa04e
-EBUILD Test-Trap-0.3.4.ebuild 679 BLAKE2B a5177b8fe7c3d09f02697cceffc354f94536c0ed21d3c19d8d471ce40a5b2e8317c14f24c5014ae119a78922db05ecfd14c4cf11872fbb0fdbce7ad87656587b SHA512 d79d2be4659bf03601ffa71301486d56fef76224c22026c85cf94d5686c939336b516be2bb15e636e9b460eebb5c7a466c5cce08103b3dfa81096c46106750d3
+EBUILD Test-Trap-0.3.4.ebuild 685 BLAKE2B 38d12d193ea25cc322299ffe71fc49d4dbb8eee666766123d436c0c9190a91280fd6cc0ab0a72060994715787cacd04910a4caa4bd77c6eea247957cf44caac9 SHA512 9e4696b49051132d378fb2d5958adb3a28063a6e4c0a8a8f366dcdff656950d60ee3ecc55686761b905673f6c123c6f99c4d836fd057ed527583e64ced552b34
 MISC metadata.xml 685 BLAKE2B 3751bba9fce75901584d8b542b2264de2d9f25891aad01e707e1f9de109512a0b3873cc9d8a1361a06bc94ca7bf4a50fc404488ad37e3a37e71212e937e6598b SHA512 69cd66374bc60f6d24fe0a1c821190526bdea729f09ed2d4d894d7ef69ae36e67c466295cd5ead680b0ed4167db9f56aa54b3f75c9140548560f436cdd3b1405
diff --git a/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild b/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
index b1c87ef1a92b..bec0d94e5fa0 100644
--- a/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
+++ b/dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Trap exit codes, exceptions, output, etc"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Text-CSV/Manifest b/dev-perl/Text-CSV/Manifest
index 1419476ab70f..c0bf8dcbe016 100644
--- a/dev-perl/Text-CSV/Manifest
+++ b/dev-perl/Text-CSV/Manifest
@@ -1,5 +1,5 @@
 DIST Text-CSV-1.95.tar.gz 114054 BLAKE2B 79a9e6dbd0f06a0116e6bf7c0100fa0da483c47b7117882f7d0a7554deea5b9c30245b03cf94a9f521d9d8bd652a92d4a11c0ff3e8c8cbfd188284fdb5930108 SHA512 447d38c9f6058251b9c3b1e42bffdec80ffe9ea7f232552921477d3c0dc1e913fe2a1cf1d4cec1410fab92a7e4e59601f429e11a005051710cd2b8d3b77201f9
 DIST Text-CSV-2.01.tar.gz 134279 BLAKE2B ee9bb832b000ca4d977869d360bf4e5367c54d248ce2eb169eb2a75df37c0ccf8042cc0114d360039282f3f3f9fcb97070046a91257486c12826a32b93bc3c7e SHA512 45c215686437e111fcd8d6c0adc9c6e0bac9df37fcd47e7bd9fcf4872859e59a296caae3573b77955cdaf42284b4c88fcc6774bd6ac11d701ae54f6a3741991a
 EBUILD Text-CSV-1.950.0.ebuild 661 BLAKE2B 2e3cb44e624cfcc623903f5a8d10c35fbc813bb6c0096fb927a9a7f3bef9df161ecef045289c53142bab823b9e51d71a554ef43d1472a5011910d198b640f7cc SHA512 924cc40982ddafeaa59ebae6c386daadc104d4e6d061bbf3e243813e568e3200140beece0c109f6382b05b9dbfc0906c05e035381499b7ac28a48179ae2191ac
-EBUILD Text-CSV-2.10.0.ebuild 645 BLAKE2B ab18d99861a06920f561ea6ca887cdbf927a6ed463b876af2d727626bb8562a4583b22aedc5a1c9341b2aeccf6a4321ec8fdb4f8f4acbefae67232aaaac78f1b SHA512 626e845c4b91044cfb9cd8ff1c09df3ced1d11402fda7e4db9a8ff33199ff11d9e191aab06d74b1711eb492f86508df9582f0e2357c3951afddb3231078d810d
+EBUILD Text-CSV-2.10.0.ebuild 638 BLAKE2B f7cbf6bc9301b54e5ce49a302f3905ebe2b371913dc623adc04cfaa38d347d74ac43ea3d6b285343472aba7415484a0f91def176bf5b7851fb845b39210c4997 SHA512 ddf11095e4e69b5e57c1b18deeddd1d0d6c24a95b0b7884b6fe51fabb74675e8c9d05969e3b05f7e500c2978ae4f9d0d314939c875d08cc429a5bf210bce172f
 MISC metadata.xml 624 BLAKE2B fb46b413819496229d101feb88987d6eaf1238063e3bd9d10a30001a2ae3d1bae052a890fc38ef7c9c0e9bcd64a7382d620c4268982bc2828516da33819fd980 SHA512 85f05b9bb1e710bc04774b543feb33fcc0c03de3cd38c9a3a3838d8d06ca966d302e8db107c651bf30c5af23a5d5e82ba5f33234d521ad086aeec56e79e74a4a
diff --git a/dev-perl/Text-CSV/Text-CSV-2.10.0.ebuild b/dev-perl/Text-CSV/Text-CSV-2.10.0.ebuild
index 3239f387d9c8..5e53fc8fa388 100644
--- a/dev-perl/Text-CSV/Text-CSV-2.10.0.ebuild
+++ b/dev-perl/Text-CSV/Text-CSV-2.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Manipulate comma-separated value strings"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+xs"
 
 RDEPEND="
diff --git a/dev-perl/XML-Atom/Manifest b/dev-perl/XML-Atom/Manifest
index 5a8f891c217c..54910c9723e9 100644
--- a/dev-perl/XML-Atom/Manifest
+++ b/dev-perl/XML-Atom/Manifest
@@ -3,5 +3,5 @@ AUX XML-Atom-0.42-testxxe.patch 937 BLAKE2B e4288229a16f078d6b64db40ba16a244dc9e
 DIST XML-Atom-0.42.tar.gz 59629 BLAKE2B b28fa62523855f95b4dbcd0ba6b4805c326e78b1a6765f927c1318f53fc9ba14c43b2f539f80c89b90431923dcc699f644bc7a8d2fd593560d2a9b5bc7528b11 SHA512 5f28b3daa01e9c709c4e07935e7bd301ae368d51d19b48fbbcf46bfa96d460f1b40806e4032a83e1eacd7c6ab397175d33cdaa5fc9792081a3bbe228798889d7
 DIST XML-Atom-0.43.tar.gz 59113 BLAKE2B d6cacd345e2a25be4541da3521d6c40e9eaa427ee8cd0263196eed30e89a5f0fb40fac92e34c928c2c03a127b3acbc493685c3d12e98b0d03ae6c3768596624c SHA512 408d0753d651da7ab4cc50d79b654e9f3680f17830a3fa36e0d1869a4e7aabb17aaf5132a91ff20f1144af09290f109fe7812baa61b23b5b89de384228649fd9
 EBUILD XML-Atom-0.420.0.ebuild 773 BLAKE2B 9cd580216a12c12b90bca5e21af716e0d730a09577e73074d87682e39a31992120033da0a5e610f4b0bb35305501c34218ac4594dc27b2b86ed2818d596e36d4 SHA512 1226ebbeb7f225cca10156fc5b67e09c6a6e1ce0d2c8bd4a1829f1650d5689aaa4625ebb1a6f95290b2d85334f5da48336b8562efd6d444ba6076be929b4a6a6
-EBUILD XML-Atom-0.430.0.ebuild 642 BLAKE2B 212c4d968408430c3246e35f9146de84902c0900a4b0cf494fbf6c4cdf23bc1f8690c5f615d57e91ac593314e000f0e302fb5f97c71677f582582c5853942443 SHA512 bb8caf44d4a86c895673fa14daf25dd07bb58acf50d7b6cc0488a807750c52516ea65b773c00d4a8902146e4c2180582f382452b1cd80d5c4ead950bee854a85
+EBUILD XML-Atom-0.430.0.ebuild 641 BLAKE2B 5b4a99b81a438e493b501e1d83331fba6412a58869a8b6a3544fb8c3e73fefeaf7f37c7daf4702809e5c122bdd74454d928b55627c742905b732a4ba6649ccbb SHA512 42922d9079cc53e440cf541263ffb792a922dee28a0428267411b328362d7bc05ff21127edf9e0464dd2a089c1350a8fc39a9f4377590039cc71172eafb74b52
 MISC metadata.xml 1296 BLAKE2B 590af64d8e172569d596d626a8ce3f00cc01631d49cb0f82d928adb8b65a4b9351cf681e06f8b495e1e9095ae85862c15e597da02bfeb2c3b8ed2dd7556fe8e4 SHA512 556f7a839e8b468f8f89f1b7ce00a766c54ad25369ade7b20924d08113958e72eb834b094b9ee24a6ae43101e27a874af0be831ec9b99df484cfa56d23340458
diff --git a/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild b/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
index b4589199fc32..359bc64e92d0 100644
--- a/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
+++ b/dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Atom feed and API implementation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-perl/Class-Data-Inheritable
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 89e6ca96ff11..18c5bd2f9b16 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index f827c58191f7..edcbf169415b 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,5 @@
 DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a
 DIST event-3.0.2r1.tgz 198176 BLAKE2B ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b23023ce37c5b5fe94c782d3a95a3a9bee8263cca3329b96b848cb213de7fac73c6594a8fee0c7c299b5f44215 SHA512 b117119814763bffe1c2c44766a822f638cd0873eeede29aab139fceb09a09df264f0d7b7e882b21dd9a7e96f45d692b45193509c3f53e0f3b10feb59c1a4ae4
 EBUILD pecl-event-2.5.7.ebuild 1105 BLAKE2B defec4ca79b47d5537497093f04cdbd01c69d6b5f4a873cedadcb5e9dd888bccfcaec649192ae3745e77f263d585194431cee210ed6b726d9a4f636d9e4daa78 SHA512 e4ece44cc0fa80ad7a7601f90c3684cb03c8e1ce2112bc4699d6884458102790b2b60ef287fb443a7b4c1d58f05aa6f2840871fe0b089b32d108fc6b8d71f889
-EBUILD pecl-event-3.0.2_p1.ebuild 1271 BLAKE2B 413bd511d479436bdf81d6d1717dfc8457278ae3fe5d44229f5b8be5695d39aa15df9e06b13ca9038408910aaec90c6a142cc53c0894a6b0424906a149ae4fe2 SHA512 4eef23c64dcf205812c2ea0e2c8a764ecddc4d8296742644df8de2ba3f5814385b90a9c283356604e40a4409591b5b9336b4251e8e8cb36ea7d296f1ccf7d5b6
+EBUILD pecl-event-3.0.2_p1.ebuild 1269 BLAKE2B 6cc6a5c70379094e4aa9f3df93d39de2d7030647ab2af89d22a9ebd1892771a8c021c86cc834e601136a58a9efd5501ae117eeaa0d120aead660ce3ef657493c SHA512 129d9062f5bac4c4ef9bce744ad82eb01d3ca892726ac1f02282a5dff3799f9d7174afcccac30c13dc687edd7ad5c17176216333e943edb80bdd0d67da1ed276
 MISC metadata.xml 462 BLAKE2B 397d205a4e7427357ba567ce23219eb0dabfe1e80cd543603499d1172ab6e44070cadcda8adcdb506967595a02ac14212f900570f71507af6e5f1640bebadfe2 SHA512 a7dea9ba80d58b6ff4761c7446d349bc2fcd1562901568e05cffeb31bbff287d3fdbe7d0ee82af0d3cd91e76cc76cd992b6615cbca9ca8488a587918a2f057af
diff --git a/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild b/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
index bb93011413f9..200d55cffedd 100644
--- a/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
+++ b/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
@@ -15,7 +15,7 @@ PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 86267e2724ce..e0c56c5249ac 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index d8242fde26cd..b5f56d3c6967 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -3,9 +3,9 @@ DIST astroid-2.8.4.tar.gz 391667 BLAKE2B 118a9dce88ac081d0057134cf4fb158fb8ca9c0
 DIST astroid-2.8.5.tar.gz 393800 BLAKE2B eb3e7abe877da8054dd9e5bbad89e23e8cc6bfdb5c224674c1559d0bf6fbdfd562ef33d65457b26394fc9de38f77e5ce3c15509d71993d0d07ddfd00b97fbcd2 SHA512 4dcad05763419db2814c4e6a8f0a9b62d967e8855ac77a3cedf90f6186d5c68bcf037ac36e4af8dfcbaad3abab3b8ec2485a5973f5ac1952971c335a827948ce
 DIST astroid-2.8.6.tar.gz 394852 BLAKE2B 400531227ce5a8b0f284f51ccb2d37aeb0463ee0fc7faceb3fd33b4bd727b7283421fb69c50eba3246217e06dca2cecfac49030d33c7e2a7cf252144860b50a3 SHA512 8fae723f0b7df34ba51d7f97634b09173956ae1eaa1543b81af8a80b5d9c9fcbdd96de709da2432a935dd5fc7369f9f1ea03cf2b7e3f0b09dac8485145d8f1d9
 DIST astroid-2.9.0.tar.gz 404906 BLAKE2B 2aefe21392289b95a4ea3bde047e6f33b6915f4feac722164b4c35cc97dedb83f7d2e7f277485c5a3a8c7abc7865ccd88923266aa675755eeb17b0bd22077931 SHA512 949520268303a257102c2348920df9ff779bf5736739be5985b0441fae664212bee476445dc5d52478e789e08bbd5826ef83cf8a730a73d4e2d6eb04251c3cee
-EBUILD astroid-2.7.3-r1.ebuild 1238 BLAKE2B 78df5825c3c329c165904ab208051fd7a9b92675b6f8db880969aea9a64dc01390194e700e4c6010224ef97d0280bad665f03b46780f7ae78a92a9c4c6666d9b SHA512 9f2082e6a8bd5dbd8671e76deb81081b331e977f7efc6bd2ac26176eaa12c4c33b268d46a956fd23287209f2ae346f6566d623b86d55173c9bcaa7c5e2443126
+EBUILD astroid-2.7.3-r1.ebuild 1244 BLAKE2B 67ee476429bfe190bae26848a03d506782e7fbdcc57563101253321537fb8123a5d45c81f9710f236d8fe471f7b58f66f15c2725d0bf36cca6205123aa1b4bea SHA512 15b5ff612fd7d0b10eb60e3c45a7e5f45f1980e3aa8d38e0cfdf3f349313da5e7cc0df59ac655570c47d00d14586b5151179d14dd74d30240637317a1e4d0d8f
 EBUILD astroid-2.8.4.ebuild 1299 BLAKE2B c093e88206d0f820547b7afaf95b13c97c8c0635fa096fc98923cd711dd7fc7c05478beba6c42aa099c5645813d37cbecca4157c2369d9eb013880c32f6e2124 SHA512 e853ca621bd253db6498b0d16c941cb13ebe8f2c4bdece39094592b7567f6504a72db8444151915982484748e10898efdbb41aa7b47f872fb0b5488534036340
 EBUILD astroid-2.8.5.ebuild 1307 BLAKE2B 513e6157c586c84c4e676044e22fea04809eaccf88fc7fd4346aaa960708828d8905e18e52d0fca04142ba5f43b3094035837a0bc873b78f5174586c39799c62 SHA512 07fdea1691f956c3810e4330aa44c58af683e9483561647da633c8e2e3ef8cefef9e8b2cafa1b1da221a43a90c1b67ad191446cb1548a0eb61a1969f79176c8b
 EBUILD astroid-2.8.6.ebuild 1307 BLAKE2B 513e6157c586c84c4e676044e22fea04809eaccf88fc7fd4346aaa960708828d8905e18e52d0fca04142ba5f43b3094035837a0bc873b78f5174586c39799c62 SHA512 07fdea1691f956c3810e4330aa44c58af683e9483561647da633c8e2e3ef8cefef9e8b2cafa1b1da221a43a90c1b67ad191446cb1548a0eb61a1969f79176c8b
-EBUILD astroid-2.9.0.ebuild 1307 BLAKE2B 513e6157c586c84c4e676044e22fea04809eaccf88fc7fd4346aaa960708828d8905e18e52d0fca04142ba5f43b3094035837a0bc873b78f5174586c39799c62 SHA512 07fdea1691f956c3810e4330aa44c58af683e9483561647da633c8e2e3ef8cefef9e8b2cafa1b1da221a43a90c1b67ad191446cb1548a0eb61a1969f79176c8b
+EBUILD astroid-2.9.0.ebuild 1313 BLAKE2B a2369070f9afb6c6cd9f33436da51f4cda79e80e0941bde85074a3fa922efe603d06daacc3d8201bf2110415067b01e804b9060826c57dfbd5eb27e6722496ea SHA512 508e08f69a7c7ec81b90bc003de01a339c01869ecbcc5c06729eece77f20250ed904ff52eceb1b7b430d71b1242909541518483ce17b6f620154e054011747ce
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.7.3-r1.ebuild b/dev-python/astroid/astroid-2.7.3-r1.ebuild
index 61e1033dd97f..0f33e85134f5 100644
--- a/dev-python/astroid/astroid-2.7.3-r1.ebuild
+++ b/dev-python/astroid/astroid-2.7.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.9.0.ebuild b/dev-python/astroid/astroid-2.9.0.ebuild
index a7739e685def..aeffaeebbac6 100644
--- a/dev-python/astroid/astroid-2.9.0.ebuild
+++ b/dev-python/astroid/astroid-2.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 2e24a5a39290..36af6e96c328 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,7 +1,9 @@
 DIST black-21.10b0.tar.gz 1171813 BLAKE2B 71bf628aa3b2b0a73c53446061d07ed0074c2e136c6a4dd09feb4b7dcc2b8c8045417e2c6a049a3051bb2e8fc368037c540851384d00ec89ad943d0c8f949c40 SHA512 0e44fe6c34d75f135996bcd62768f3ea02f5ba996992f0173cd28977f6a9ed4fde975e7433439f3b724c54555867f91edcd167fc1c5273308a613a51905323c8
 DIST black-21.11b0.tar.gz 1198297 BLAKE2B 658f20ea9d61e64a34a61663ba4a0b0a5b3329803abab091679a605ca884b918aa0029f23cb02f4f0e150212ec25dad12985a7a2b3c95763f31ca7d4c823b653 SHA512 f3608008893747abbc2d47bf098d963dede57104d15312de6fd86f2f0c025da39a83043f63b29a208350f4eb44cbb7e47a1c8c38ef50414e9c8969feea2edbfc
+DIST black-21.12b0.tar.gz 1200305 BLAKE2B cd019b230d2ba1fab88075a5e14cb5de88a4ee283b53d869564f071a104d2810ca31c04db09310b99a1610bdace7d5b9b360b2a3a4810822322a4eacc8998ad8 SHA512 1f6e4eeafd653fa9db608585110f5c5067942031b2d67e630befa899d7fca3c35f52cbde8fc91c2697fb294fb16525254756ebce16e556fc139b621f738bfa22
 DIST black-21.9b0.tar.gz 1167869 BLAKE2B 31933de69cc34e23e14b0fdba33da844697816cd3917227c1a16c4d1595435d3715405f7f1df820953e83c30c3947448389a703ee662548226dfc2d278b87844 SHA512 0c8025d64ef9e5da8ad73b1f265b912bcb3d8cb00d8a426a39dd4c70505a77150e02a7f26e3d6842456eea367da9fad29d08f586b175d57d66a09cf389442ed0
 EBUILD black-21.10_beta0-r1.ebuild 1821 BLAKE2B e082221a604f651340b3cd55c47337eef8c02a2d93f9b7cacda64913ad285666238bcb8100f10d8362784b019b43ccb2e236dd357a39a656b2c2bae4d7ebd8fc SHA512 6c97d6e9380ea3f37ee58291f8f0052a9190c0507255663d0291f97da75440ba0d3ba888fbeecac09c1010a0600eb4e268bf21541a34e0b279fc20360dde9c39
 EBUILD black-21.11_beta0-r1.ebuild 1821 BLAKE2B e082221a604f651340b3cd55c47337eef8c02a2d93f9b7cacda64913ad285666238bcb8100f10d8362784b019b43ccb2e236dd357a39a656b2c2bae4d7ebd8fc SHA512 6c97d6e9380ea3f37ee58291f8f0052a9190c0507255663d0291f97da75440ba0d3ba888fbeecac09c1010a0600eb4e268bf21541a34e0b279fc20360dde9c39
+EBUILD black-21.12_beta0.ebuild 1785 BLAKE2B 580ac8d4d2edc88bd81366b91fc6007fea145f159a179fe7a5d1ce3b30f9c2ff610b882bbe62393ee084bb74d45124183ca9e4406477df8cd7300c86f0e8ced4 SHA512 48855f3de18a23dbbbd309372f2ecc5a7dab4a70b31049328a2daaa894c158922e4e468dafe46b7416dab9f7179a13ef49f816f0ca33a4fc494a7b1b1b700d92
 EBUILD black-21.9_beta0-r1.ebuild 1805 BLAKE2B b1b733b3dde8c92c5f1bf798fb0806583df1bb96e658e83b6f4498b8e236dc759023521ea84ddc502477286049a74258f838dbb16c08b278c914b1a123dbd314 SHA512 ae22445d20301d7b7679b798da258fcf61d798e66c9894a50cf766b006f7719615f577adc7273eb6e7365dec9002e453bcee77471f459693f5e78045cea904f8
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-21.12_beta0.ebuild b/dev-python/black/black-21.12_beta0.ebuild
new file mode 100644
index 000000000000..c92df5c194af
--- /dev/null
+++ b/dev-python/black/black-21.12_beta0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	<dev-python/pathspec-1[${PYTHON_USEDEP}]
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_{8,9})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
+
+src_prepare() {
+	# remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases
+	sed -i -e '/setuptools_scm/s:~=:>=:' \
+		-e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cp "${S}"/src/black_primer/primer.json \
+		"${BUILD_DIR}"/lib/black_primer/primer.json || die
+	distutils_install_for_testing
+	epytest -m "not python2"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 8bd95db03a57..f4c0cdab4889 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,7 @@ DIST boto3-1.20.17.tar.gz 452876 BLAKE2B ff59e490e5938bea7cdd0ae54f82c33d410b42b
 DIST boto3-1.20.18.tar.gz 454201 BLAKE2B f6e87d93fcfe525deb34166310cb830547a8d51280b48005d25a9bfa5852a1a577bccb91f2fe0825991ef4f4b5a1340b6f0b505be864338386f2e02b522a2236 SHA512 22b349efbfcc2a4e7dd9be8a8f19ff5a399c7b474ac615f065e2fe62217ed1d94951744e9ba266c85650ff92c7b2183c3916f3d39f62d0d685742344b2500992
 DIST boto3-1.20.19.tar.gz 454558 BLAKE2B e1d08d2508bee7b22af370b4566d4f1b5e65b42b3993f4e5bdf7398703381e34c7da0f497506972643ccda12a746848a2198deb01990d08740b9ea278e1b26d3 SHA512 0df24734b3961a49380b39325278a3fb50e66c21fb5dbacf1133ef0e4ced1f7058c990b48e1dd0fc7c949fdd5f5674810b5e311df0e5a862d3877d41eb6475ab
 DIST boto3-1.20.20.tar.gz 454638 BLAKE2B 031f919d5c75423b14fe04712bbe93c8c0b43ecc016b096ec54a9414a6277c200e0e4256404ed1c20d7647fb0ae5c7b122b6b1ce09cf7b8fbaa4f08fb8bb1a7c SHA512 fdafbf82f9a0671d0483dced01dcdd895a097b461ab137f182af8d5bda25447c681b12ef5806d530e32219c6a30e7561b29bd9d61ded9faa524617b86ee95665
+DIST boto3-1.20.21.tar.gz 455027 BLAKE2B 034fd322a3c304f1d8074f89ec12678e964983abc47b5484a19e8c9c9e793ab66a2240f26167e581028b32341f3c938d1d4cd2ad3b1e00033308d44c50e4ab94 SHA512 b9823f6fe651d9d74034a1e2178b372d01d56fcb1c45d9436d2d8d8347ff7cdf5c156e43f3212ff273d89bfd71f838e4c24c0e1c01bd2fc8d5cdc1027db5dd47
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 EBUILD boto3-1.19.12.ebuild 1258 BLAKE2B 6f4ffa60c9645faa9bcf1ee9c7583414660603d245a6b39cae1c7933cb0ea80014c3ed6eb92afa5d2b54b747f82fc1e2f356a142ea3c77ebf39944d9ab8af49a SHA512 3b5bef76f465bee83c03335581567c3d984e980d261de67329c0f6c9eb49317422c07829b4b368f30b9e37d08c4b60a6c2ad39501724a7d18cfd71c55630193c
 EBUILD boto3-1.20.14.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
@@ -13,6 +14,7 @@ EBUILD boto3-1.20.17.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267
 EBUILD boto3-1.20.18.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
 EBUILD boto3-1.20.19.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
 EBUILD boto3-1.20.20.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
+EBUILD boto3-1.20.21.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
 EBUILD boto3-1.20.5.ebuild 1416 BLAKE2B 089d128962ec5e55846a7a0c0af7bec14201267edcdef77a8b6e17d72081c025a686210aeecec47b4ff6ddeb772d1e239ef8f49b50cf0901a5c7dd8bd027cd9b SHA512 6fc35112e805b4d9f7ff1a20f7096d49d52fec6edd6fd1feb0762686778b2b9fb20d1edcbc90fe94545200525473c974f8af9d386aad59231c8d1bb88eb8a112
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.20.21.ebuild b/dev-python/boto3/boto3-1.20.21.ebuild
new file mode 100644
index 000000000000..a4f6b1d0f3c2
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.21.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests 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 de9f70a725b8..ecca0a2b1327 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -6,6 +6,7 @@ DIST botocore-1.23.17.tar.gz 8604819 BLAKE2B f6be48e3d0a2397be4934d9adaddbc4f2d7
 DIST botocore-1.23.18.tar.gz 8647407 BLAKE2B a1c5a9006d0e2214ad1fc89752043832e657a2bb1994b9b91981430d6544818d79d669cbdf8e41b4cd6880dfb6bf001dfc03e9616da4873a89b0c3f8fcd3fdc5 SHA512 65ec3aad0508dc9a4d0426658b5a0dfec011613d236248726f94e128c2b762ac652fd5078973a9a7a101cb1a01c3dadc52b272a584310cf76ca798884c06f25b
 DIST botocore-1.23.19.tar.gz 8666566 BLAKE2B 617704ba2bb367f864a6b493be9b643e52f8c22041d255252aae5e21c684544db1d58fc06f920e20ddfa54b8a3c166627d046b79d6ef06db2cd034fb58397258 SHA512 6a551cd50ecbad954982a7e6296c803a20d28065df04c9ca482b91aa91b6f336df8f81fd706771c0f04d55e2f3803cc4f1ec9b347e490e492515df427f52a692
 DIST botocore-1.23.20.tar.gz 8668630 BLAKE2B 3b6b65dd73886bf05ec52fd8e2a3d139f29b56019647f66191578d46dd68bb6c71136632cc6576d8fad84f931990c929e30135e74e9f2125bef14b1cfddd35e4 SHA512 f60df34af21a1d2f8c0d85352404ada5c83eb2bf9190fbe2b9f371c02e95bd23fc2b1e9e857a66057f93af62d1c30b908fc343a1505ad1cca0f245a94026ea17
+DIST botocore-1.23.21.tar.gz 8669970 BLAKE2B 18dbd124834a16e5ebf925e8bd1c38ac86a87bbf2c7f10afb2b885833d95bf16893ea287585b3c70d656b888fd59e02b8e1ab4b9eec06d57ba9d1693e1a3fed2 SHA512 557ea1915a83a683d02ecba2731a274422d18640b4f063e4aa7bb68987e477106495143575f2436cfda3c945164de91b61c874b8d8768aee80109d360bf72211
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
 EBUILD botocore-1.22.12.ebuild 1105 BLAKE2B 67442baadc85283cd67ea7877938531c70e59285747e631dbfa9ce1519e646af98169ff4ef538cc6731874a06ee3f2948fcf763abbf889a3e3b2d73ebf1cb69e SHA512 73b94ac5892d16aeecf54be238ca180d909885bfea39653d4aaa9e80dbc89aa3f0b040bff51200eaaf25d3642a43f1341d5dc3c27dd65891c368ada5d0ab3a82
 EBUILD botocore-1.23.14.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
@@ -14,6 +15,7 @@ EBUILD botocore-1.23.17.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3
 EBUILD botocore-1.23.18.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 EBUILD botocore-1.23.19.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 EBUILD botocore-1.23.20.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
+EBUILD botocore-1.23.21.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 EBUILD botocore-1.23.5.ebuild 1492 BLAKE2B 1f5aeb1848517bde30f48ac3062e0d9970cf574722fafc085ec08286932b449d6c36933c27201a785b8f986fb40d791cde6fbec6fcd397276c2a0d1677ce3e61 SHA512 773a413ac1394fb6d3a183fc41cf4e8fce184e7f8a470f215ec75ae19f47a792a1ba7701e7765a5ad9480e458136904670608a769f1a323ad1b2f0b55963bd85
 EBUILD botocore-9999.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.23.21.ebuild b/dev-python/botocore/botocore-1.23.21.ebuild
new file mode 100644
index 000000000000..80a198d56414
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.21.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/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/cattrs/Manifest b/dev-python/cattrs/Manifest
index 0fc9a0a5751b..3bcbb49a7a4e 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,3 +1,5 @@
 DIST cattrs-1.7.1.gh.tar.gz 85853 BLAKE2B 36c411ffa92eb263b85d48c81daeea1deea10d5779c6cd1f57988792ef5ec68bedc20b59620077e6500c2e41bb91e83f110467083f90219be7e2419c3880ed94 SHA512 a72370541cbec8928f9e1ae0c130c94e71d826ac522eb39062840d4b78a7f6aacd13395b677f6ff1453e327af31a71af0e5f81893f57ba33edbb53b7683835b2
+DIST cattrs-1.9.0.gh.tar.gz 102241 BLAKE2B 89cc71de97e1e63d3cfe3a4169c20e44d9fb8b85c6f939a0503d569dbf521d97ac325ead7c8bd58d4d32b6c6097a70effdf58553e334300639d6ef6c26b40bc7 SHA512 e1e4e59f802baf63cf931b3798bf39e4f18d5ab12a9aea000c2b649d34905d29ccb94f9ccdc5b2c52e48114fb9b292e59ab86da4c747243cae8a9d9ba25e768c
 EBUILD cattrs-1.7.1.ebuild 1123 BLAKE2B fd03053a94af87eb9501a845a6aa260f91c734951cf33c1314b7c9ce19fae4c53e392647a9129b7fdcc9731c4a3fc06d2cd8e81df4c1cade33e6d334fc13adda SHA512 8aef9a77da0c0d8b223a1bcc01e30471c29edf64e0678c514a38c8225af3d3e1ae77d353615eda39aa66d98ef5aba2062f20a3a1a838248c8574a606504d930f
-MISC metadata.xml 341 BLAKE2B cd5eed6e767a0b6c3d3b8b105a760022dfb00a6847b4b7d5f684c4b7bc852bd85b2878988e34a393b10232c7f6aeaf96c68ea4265de0fedf3be9f459fd03dee5 SHA512 a83dfdbf6d808cbebf7dd253f2a03245f6fb8a3554f883aaaa8273c26c31aa92e94e6f397528a74fb5646e31d80dd1c0da3dda8d5a535d783110f4f0b9670a27
+EBUILD cattrs-1.9.0.ebuild 1137 BLAKE2B 7ed3be83168d261a170ed68ff430edea4e62b6561d0fbcee3b1f7109cd7c632be686df8e00c1809fedc0a3236eabaa66fa6be9a0c232d568fae854dac276ed1a SHA512 5be28fa697fc8c2ba28da15bf897906341ffe818ddf5b4b12ca4e594197dd7b6c2cacd8b32cdd557351c2988309ad60f752fbb96179fcf35fd30f51b433afcad
+MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-1.9.0.ebuild b/dev-python/cattrs/cattrs-1.9.0.ebuild
new file mode 100644
index 000000000000..dfba59ab9045
--- /dev/null
+++ b/dev-python/cattrs/cattrs-1.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Composable complex class support for attrs and dataclasses."
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/immutables[${PYTHON_USEDEP}]
+	)"
+# test_preconf:
+#		dev-python/bson[${PYTHON_USEDEP}]
+#		dev-python/msgpack[${PYTHON_USEDEP}]
+#		dev-python/orjson[${PYTHON_USEDEP}]
+#		dev-python/pyyaml[${PYTHON_USEDEP}]
+#		dev-python/tomlkit[${PYTHON_USEDEP}]
+#		dev-python/ujson[${PYTHON_USEDEP}]
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--benchmark.*::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# unpackaged deps, see above
+	epytest tests --ignore tests/test_preconf.py
+}
diff --git a/dev-python/cattrs/metadata.xml b/dev-python/cattrs/metadata.xml
index 04146e11f924..1ffb8b193cd0 100644
--- a/dev-python/cattrs/metadata.xml
+++ b/dev-python/cattrs/metadata.xml
@@ -5,7 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Tinche/cattrs</remote-id>
+		<remote-id type="github">python-attrs/cattrs</remote-id>
 		<remote-id type="pypi">cattrs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 57fb91c60809..fd985514ac29 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -9,7 +9,7 @@ AUX cython-0.29.24-unaligned-format.patch 1632 BLAKE2B 04b95419636cffd58e4a93222
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
 DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
-DIST cython-0.29.25.gh.tar.gz 2099536 BLAKE2B e07706662f860d8c807dc4a13660a05291eab9f33994a88639f565e9020c495215dbac9cbab69b7947ea82844a72706edfccb54f53dd80b5908ca703f30ee435 SHA512 6d1f0822eb6fb43372d42ebe3684df85ff430f58ff1f6d5774a2e1809d1f5ddc8827cee40cdc81bcb8b825cdf7b51262823a69ab4502fa28468cd1a1acab2283
+DIST cython-0.29.25.gh.tar.gz 2100012 BLAKE2B 497c2550c870c808f1c972d3e9ffedd6672544b9976653faac4a4125008e4472ae5a2e0db0510c8b2c5fd11f73a5885e0e4394bbce2f1327b7610bf59b64f640 SHA512 1d655bb4de8bd3480bcd579c32cd0e5bfc5cfc3d966d3d892b98cc86f59c9bd0522066c4c5dbc4c6abeb3ebe3fcd3f49ec873dd724f9ad04976635f652fdf9e3
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
 EBUILD cython-0.29.24-r1.ebuild 1932 BLAKE2B a2ecc222a291fc50a5e8f6f6149a7702b7430cf413a34ec748a62520098c755af92e6f945bf47df0a3be80faca57a21baefd7da6c6479a8abdc6462ba9a8b7a2 SHA512 6d1b1c269003c998d6fb2b326e58efd0bd434d494d9dccda5fbc0512b9e75c3f2be0a677a9b42755141a642dcc06f5eada7b7c7f16c5557be1d797be45a80115
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 51d0f6da7f7e..f86b63970d8b 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,11 +2,20 @@ AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fb
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53
 DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085
+DIST Django-2.2.25.checksum.txt 2556 BLAKE2B 81743dc51043d12af7dce1f70190a1e53a6be7a8ae6f34fe10fa713321f8d432119f6e4e58679866a8d61dbe640c8c18d97dfa9a3767bbafb5732b9619ecb475 SHA512 1cc2982c3ab83c4af47adad14a07badc301f1b03640c34ac043ca663ac0e8c3c0a9c4de8ebd01e29f2e2c8441ae29826c91faa8f1d4e6f6824e7c849a868ddf7
+DIST Django-2.2.25.tar.gz 9185326 BLAKE2B 54df79f3ee75d588cdf46c931a53331894bc113563d2e472cf5472ba66eac1ed62f9e54798dd726837be2ef9598ed20936dbe5e3ff395249e7011af3d551e672 SHA512 c3d377c8d1ce54c93477615cff1cc74fc21791bc9db6b059787e07d0bc25b4d0c1a5804bf781d45ebba1f5f5c280957cff2bba063fea4fc005a1e945b9a7fa8f
 DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d3774073c57538b10f1beeada3128de2cb3d861684599fbf5f337b0ae4eff3a101998da30d8d961f84ac7cb3bb31c5 SHA512 07870c27034f70f335ac35b34317944947f544f63108f21134e81326b4e8f05a7cb3d382d91e7f0a846d51944032efcddca2c3bf980f626627c74c388932e4cf
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
+DIST Django-3.1.14.checksum.txt 2556 BLAKE2B bb17e596d076489ac00b6b3eb98ab2949692a82fbc542537f3758c2a53ea4aaeca15bf00c49b363e00d32c2d6face05e6b6e07000219cb8e5ceea2f9d9918ec2 SHA512 a0dd1e9dd739e6891435a02ce4711560c7f0c869a04d540fdb1b90d2cedfdd7d9892e442fb991c4f4cb8ca1862fd8f3a55d88a10645ecf0178d1ea63e17e8e89
+DIST Django-3.1.14.tar.gz 9659386 BLAKE2B 5e9317e777e3879f2cea3eea98018884c073eed47c3da9aab09858bc0869f4f34f48d20860c32344446498879b6c9b5cb9d5ba12f0528b703436a2c37325d286 SHA512 5356f453e23a33092221137769a594608771c5832c0dc00453e571fee056438b5366eba720b1fefa33099356980ee56a9665fc6ed7c86f5412e45d6432940e64
+DIST Django-3.2.10.checksum.txt 2556 BLAKE2B cdc1b28f213e43b27b0534587b8475bd68979f3c179357a7978109fa85ee0a4bbd5d0bba4625e6850aca603f688483dbdcb102a7411e74394079d2b0c0ef767e SHA512 852f867a5a11f11f98710cf27fdba2774de537dbe1e5edc402214acb65a6e00bf05a7b4fe5eb663cc21aa6ee9da890d7c74172a17c1b084db89ada1ff1db3745
+DIST Django-3.2.10.tar.gz 9811341 BLAKE2B a2ed3dda0d88a884443cc07446921fcd9cc9f302b5f578910f2e4027f8d87b92717bb22a7bf73cdb44fb7ddf4c178349e31eee6b796a45727356cde24e41d318 SHA512 6b793a1e544ab988d909d9fc5152d9dbba864c4916bb1f703a07c72f1a945ba93ba53b2f8843b67a16d0e68a736c43faf2f3d8aaa0867de1668c3845c24da7da
 DIST Django-3.2.9.checksum.txt 2547 BLAKE2B 7a1c38abe3215ee4533984c7d78c37b369545695fb11d84d6600d64eec290addb9257c4d2850af4e311df2245799572e0866917e09713643376da7859754a2ce SHA512 9aae8da65079e20dcf9071fd72fa5f5c61640264b52c842d96cc2f697ba1d5003cf7b7c6d1f95549eb8ec4449679a00ddd267c022b3d0483ab030cc96c9405b7
 DIST Django-3.2.9.tar.gz 9809157 BLAKE2B 27fc04e874055f69466f06b009c015b46c2d2fa9ddd0005f7b2b7b32a45bd1b8a9f34e693027e040b8d05fa581dfeb9a00aaa1d876477cff5292167f20768b60 SHA512 62fb297694a7f5e48465e102dc97e3d1d04b94499bc6d98d37a00d96b438b8c919b6d08055868a1836d62b89ff65ce4fa7dbc9390789dab2eeca0187269b125f
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
+EBUILD django-2.2.25.ebuild 2681 BLAKE2B 118d4965e158c05702bd26488d3855f50cde2b711ea38fd010f4e251bec26420c760ae76be5532a9652e0b1e89b0f2553666f832834258050ef384622fdc5b60 SHA512 57e4675a6c154733b85a04e2d385efb2655aa0132e3207a798a659b269102e1fe5a2d3a0853c6d471538fe8bf17aff4e340e1709e12d286722ce29873eb44a53
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
+EBUILD django-3.1.14.ebuild 2776 BLAKE2B 1f0d16ac3b8603f4b8d81a056c3942bcfe9b0e1422363ba1d12abb7cdb4fcc3a258bf5a8bc0cdce96c2917b1d621e32a90bc86d1511cb5b0fcfcc7f9c08fc779 SHA512 8951f78748a1539a56aa256b636ad808f2fa1b90108a9b124afe1156824ee2d3dc749c4fd772d8ab046c296194cf4e8d77fa8202912f7dbb184fec0e8331d86c
+EBUILD django-3.2.10.ebuild 2901 BLAKE2B fd56aa9bff6a70202113eaddb416a2f8877713f871b1cf22b94d59615b2fff48f2bcb337f0f96ca39cb8b13885fc4e8c1deb2207cc7340490286a1ca9033b443 SHA512 c3ad10ca03c068e188723ce8e65ce744219bccf1450dbf5a00c28d21ef4b9755c91db82e89238b88e6c643fd5b038c947b0806c9270756af66a81c7f0b5babf6
 EBUILD django-3.2.9.ebuild 2897 BLAKE2B 3eb77c93ad333559fae6810321a035a7bd66a21400cb985517523e6656af3409e120af7f3434a2a11ac4e97a1afdc2745a32b5a35928dc5197b2e7097540029b SHA512 7b68975726c94cb166a985d36a31c1380d5e6c54a6b858a3cfa3f50883f22518134de8f89eb322093af45224d2db1c631e413db4d35abae41428448ec1c8da4c
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-2.2.25.ebuild b/dev-python/django/django-2.2.25.ebuild
new file mode 100644
index 000000000000..e49bcb28c32e
--- /dev/null
+++ b/dev-python/django/django-2.2.25.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.14.ebuild b/dev-python/django/django-3.1.14.ebuild
new file mode 100644
index 000000000000..c950cfed8a41
--- /dev/null
+++ b/dev-python/django/django-3.1.14.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.2.10.ebuild b/dev-python/django/django-3.2.10.ebuild
new file mode 100644
index 000000000000..28502c5a9117
--- /dev/null
+++ b/dev-python/django/django-3.2.10.ebuild
@@ -0,0 +1,101 @@
+# 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='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 998f3c99cc23..7ed57d29f4d6 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -5,6 +5,7 @@ DIST imageio-2.11.1.gh.tar.gz 339241 BLAKE2B b197c946fe34e504979c9fe7e69179211bf
 DIST imageio-2.12.0.gh.tar.gz 339829 BLAKE2B 5f6c38bd139c33e7fc00fad8f32cd2f9888fa61a4930021b58fc33530241cf8d40e13002cfedf21631d1ff18797a9d044288e3ffc8852276912ddd7485206ecd SHA512 05824e8617470734ca4966fa4cb0b3da5ce22bbbf2ff6382d216d768b6dd3923d072a3f157d1ba23524c4b499c320d3a8e051852f656ad5cb0f120a298daf688
 DIST imageio-2.13.0.gh.tar.gz 339891 BLAKE2B a9e38a855836dac3ee228376c49e9751e651530b316932a756c86f21f7c987f1f57387db1751ff0cd6673844cbfc8dcfd0bceee520ec6107290712db03ca9d9c SHA512 4f63a1183a631fa192e08438cfe97936f45b9157cad73c8a27ddc378817c21db3d92bab2e7565ef9ef539c771120e158075ae1069aec60d824c40d420dd8e117
 DIST imageio-2.13.1.gh.tar.gz 340484 BLAKE2B 8b05feabdcf44877365d5fea7916cc36c30f2ab9f40a909e02ccace6f457d5bfedae58a1397dc8d211d5f3738f148a3de355b399f47d80b2f50cc634fcbd18ad SHA512 3c5ca6b96a26fc19801d571af3e0d804b4946bf34d8d3ed52b946bdde595a90ff8c0da7fb2949f6a1d2d6ba5799c2feff6bade04de40cb9a807c7cd30e57eaac
+DIST imageio-2.13.2.gh.tar.gz 340635 BLAKE2B 463607eda8b3479d3f76174ccc6674bb1f727cb2fcafa5c47ce63241188d6396619a57725032812bb531aa4a36a00d28e4ad95d8a82de658c755405d2068a0f0 SHA512 0b08d12463075fcf8a45deef04843bebf5932347fc34aa48effe7d29232fcc482fd0d4fa29bc9a51a81e343e1636823931db5b28290ffa67987b608cc51a8e99
 EBUILD imageio-2.10.4.ebuild 839 BLAKE2B a63c9296ecd0ff789d0cc693865ca48696745b1785f1ed66f54844804d6109db9a89aa99f810eebaf012f9508c6f48c4b2d3c0ea9aaed14fc8afd22370dd3a61 SHA512 bc2a565d6bc4cad9c1a44d4db1da56e3fe6b4377551eb9db4450a23cced103c3b7db119ca986ea4a1cafb2a30634e47c926ac712e5fc31bee4c38b9a4f03e900
 EBUILD imageio-2.10.5.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094cf5eaa9b7606bd28947770a30a8829bb1a97f4b2828b51229fa4854e6b7e8a0067d84bb0c3e24b84a22691dadc SHA512 902821d08653b56bb547749777675951624c09fc560a2fc4b1cdbf549b8274f4a8c6198675f484646a7505f8013997fb9155918ecac41f93cdb5da12c1858848
 EBUILD imageio-2.11.0.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094cf5eaa9b7606bd28947770a30a8829bb1a97f4b2828b51229fa4854e6b7e8a0067d84bb0c3e24b84a22691dadc SHA512 902821d08653b56bb547749777675951624c09fc560a2fc4b1cdbf549b8274f4a8c6198675f484646a7505f8013997fb9155918ecac41f93cdb5da12c1858848
@@ -12,4 +13,5 @@ EBUILD imageio-2.11.1.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094c
 EBUILD imageio-2.12.0.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094cf5eaa9b7606bd28947770a30a8829bb1a97f4b2828b51229fa4854e6b7e8a0067d84bb0c3e24b84a22691dadc SHA512 902821d08653b56bb547749777675951624c09fc560a2fc4b1cdbf549b8274f4a8c6198675f484646a7505f8013997fb9155918ecac41f93cdb5da12c1858848
 EBUILD imageio-2.13.0.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094cf5eaa9b7606bd28947770a30a8829bb1a97f4b2828b51229fa4854e6b7e8a0067d84bb0c3e24b84a22691dadc SHA512 902821d08653b56bb547749777675951624c09fc560a2fc4b1cdbf549b8274f4a8c6198675f484646a7505f8013997fb9155918ecac41f93cdb5da12c1858848
 EBUILD imageio-2.13.1.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094cf5eaa9b7606bd28947770a30a8829bb1a97f4b2828b51229fa4854e6b7e8a0067d84bb0c3e24b84a22691dadc SHA512 902821d08653b56bb547749777675951624c09fc560a2fc4b1cdbf549b8274f4a8c6198675f484646a7505f8013997fb9155918ecac41f93cdb5da12c1858848
+EBUILD imageio-2.13.2.ebuild 901 BLAKE2B 5f3c1b7dd60230d099afab307c216b9b7c8094cf5eaa9b7606bd28947770a30a8829bb1a97f4b2828b51229fa4854e6b7e8a0067d84bb0c3e24b84a22691dadc SHA512 902821d08653b56bb547749777675951624c09fc560a2fc4b1cdbf549b8274f4a8c6198675f484646a7505f8013997fb9155918ecac41f93cdb5da12c1858848
 MISC metadata.xml 858 BLAKE2B 2feed77fc77fc6be127298bee47106f5fb65d9a392a05c61c8255b3e0994fa95658bf72222173a3b4447e8e802e6027989ddc3b475f8c84a998fe8c86ffc30f9 SHA512 f503c9ab1b17123c455f3f0d576b2e337a827acc9bb8d0c9f265bb022c68101dcb807c7bcbe8be86f790fca544910930388845e382e0398ac1f6a3c09d2ddb71
diff --git a/dev-python/imageio/imageio-2.13.2.ebuild b/dev-python/imageio/imageio-2.13.2.ebuild
new file mode 100644
index 000000000000..cd5928118230
--- /dev/null
+++ b/dev-python/imageio/imageio-2.13.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="https://imageio.github.io/"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+)
+
+EPYTEST_IGNORE=(
+	# Needs unpackaged imageio_ffmpeg
+	tests/test_ffmpeg.py
+	tests/test_ffmpeg_info.py
+	# Needs tifffile
+	tests/test_tifffile.py
+)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 59e7bdb5b14e..a3a2505c27a3 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,6 +2,6 @@ DIST isort-5.10.0.gh.tar.gz 728239 BLAKE2B 6a206cdd4ebceb29f8c76f1c08b3217da1d76
 DIST isort-5.10.1.gh.tar.gz 728462 BLAKE2B 5b892b9849293e8730e6d89592bace62009a8589d185b4d3a5bafded605ccd46fd0f2986fbad5cf1d72321d030e3193a111ab7e6114c6b4a7a67696f546b3a14 SHA512 545c1844bacc1d2d9e87e60b03b30a846ee1ebbfe2a229c3e018a2e1cc6e9a04a3691f1b2e7ec8575806f2341bc1af15eb64904b4eabd786d6b9b289cea5ce2a
 DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
 EBUILD isort-5.10.0.ebuild 1359 BLAKE2B 43e9e0b7d1a0b5d9161523b5ff9f2e4eb24c60aa3d55913990f2fc9056b6cefae8f18c4bbff452c0e15b50fe3a29f36809af17272a390b3c2843e2f2f00b5a68 SHA512 b1df42f6e5afc339760ba7fb0fe1ca166a0596af0185e14cb28e45009d13f2e49f8ff4bc210973c3919d8d74334e80b026d12350a4a7ee09225a9a4d3c30a4a1
-EBUILD isort-5.10.1.ebuild 1359 BLAKE2B 43e9e0b7d1a0b5d9161523b5ff9f2e4eb24c60aa3d55913990f2fc9056b6cefae8f18c4bbff452c0e15b50fe3a29f36809af17272a390b3c2843e2f2f00b5a68 SHA512 b1df42f6e5afc339760ba7fb0fe1ca166a0596af0185e14cb28e45009d13f2e49f8ff4bc210973c3919d8d74334e80b026d12350a4a7ee09225a9a4d3c30a4a1
+EBUILD isort-5.10.1.ebuild 1365 BLAKE2B c2b0c6f5544affe049ca21e70a7c5718e737a02ded15fceb6081d036fc163ee7b7e8eb8d5350f90cf7839b98bd88d385faa43f72c4fa06509bd04483c24b1985 SHA512 8ed565fa990f1ccc15fde1da844ab5baf219201ddcb3616e019138ab958e7194ae3afb5ca8c5de446529662730cc9f3497c4ea5b65150fe650a32ca56ea8a1d2
 EBUILD isort-5.9.3.ebuild 1351 BLAKE2B f5ea04c9dc2cbbd58fd8aa7d8208b3abce12c2296b4094c0215fd282ec006bbea0298a56cd8cd9f573ddfdf9ea277e188411d18093426c4fb20157b274204226 SHA512 439eba539f6c1020f8a1d8d8b4d62f81cc5e1619e8a5145606101e684df82f2d9070101dcd002fbca74b3532e9dc778ce95126911a84a5c97f28523bc8be3549
 MISC metadata.xml 574 BLAKE2B db8aac55351f15190d9b71508268f26b12a781b3b4f0f6836a30efc954b46b71da496129a9641655db483730435b44a5c5283132521dc3cc93279c57735a1ba4 SHA512 c8116bf66155ffeb7ac8d68822559e18252210dae604b4984aa5e6a3fb7161d785cbd235dc6f656513b5bab326f6e579489245bcef9d0a5dfadc34d7477758fb
diff --git a/dev-python/isort/isort-5.10.1.ebuild b/dev-python/isort/isort-5.10.1.ebuild
index b47f36b80ae6..f823a07ca519 100644
--- a/dev-python/isort/isort-5.10.1.ebuild
+++ b/dev-python/isort/isort-5.10.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
new file mode 100644
index 000000000000..00789d4efa28
--- /dev/null
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -0,0 +1,3 @@
+DIST mkdocs-git-authors-plugin-0.6.2.tar.gz 27623 BLAKE2B 7b0dd3b865b067b63e467fa75018a92cea8cfeabdeb66791664ea143ebecbb072110698f1366f917f390dd29c33794c7d2cc03e03bb84f8913b572d667e77b9d SHA512 75e4a4e6f3ca443257b5f61f5f0d9784cb4bb28a5a03412cde5c226da697117a29c2f4a3d1cac2aa362421f244fd56ea8580a923414a8e096bedc4502afcb5b0
+EBUILD mkdocs-git-authors-plugin-0.6.2.ebuild 1223 BLAKE2B 46879780162e57426ad01738d03ae7fd15117c1da74177e6eae8e0360369a0423eb9d8fe00a412c283639b3092706e225de0ec62eb5f5014151f0bb95eb174c4 SHA512 003d75c488d23b983463915d695a5d00c6bd66a49e6b31d24c70da7136ef0cfc5d002344ce5833546e988ae1e927ecd32bc66a46679b8b0020795e4adf87602c
+MISC metadata.xml 564 BLAKE2B cee03d6742cb66a51c92f8999483f6c04c2b3fc7e8b88f5882bbabc577a54e922bdccf8a1a467e601c43511a372ac90ff8aa4500bd95715cffa83214ee2e64e9 SHA512 2b5539fff2990ebd293715b659e7b9bdeb63117c35933f49a21b873b45188476d3d44f6ac5b1656ee598f028e80f648b91b36ef4dae3f900705dbe2a7355356e
diff --git a/dev-python/mkdocs-git-authors-plugin/metadata.xml b/dev-python/mkdocs-git-authors-plugin/metadata.xml
new file mode 100644
index 000000000000..1ac0758baa56
--- /dev/null
+++ b/dev-python/mkdocs-git-authors-plugin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">timvink/mkdocs-git-authors-plugin</remote-id>
+    <remote-id type="pypi">mkdocs-git-authors-plugin</remote-id>
+  </upstream>
+  <stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
new file mode 100644
index 000000000000..f267258de4cb
--- /dev/null
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Mkdocs plugin to display git authors of a page"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-authors-plugin/
+	https://pypi.org/project/mkdocs-git-authors-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# mkdocs-git-authors tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index a9af6c4ede8c..238bb2458470 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.10.0.tar.gz 368270 BLAKE2B c00956c86394bdfc8b2fe9e51e7588362f6bd7bc3bde174c1d387377418a47f56f01137e597405146280bba195ebf7aa5cadf67e9514734e5874df69e4990857 SHA512 8ce742cd995c180372a9d76a96c19f4f7c7b9fafe5c67f13e2c1d7377dc18e071d379cd741cb5f4a84be9f275b3f3d74d23875e766a7dda86498acb0a08d4344
 DIST mkdocs-git-revision-date-localized-plugin-0.10.3.tar.gz 368559 BLAKE2B eb0a1e7f85a99ac6f79ebe8cbb547e4b836bde22909363492b63e0bc40ff139fb1f16c9de5662cbb1ba5ab65f2bb8cd3a6f871bc81b894218c4a7d2b8a37770c SHA512 f5cd242eb48cb50c426c9dad76d36958ed31434090986ab5062d8b57ff941ec4dfd9e1cd1f50ac6713e49751afb476e9bc1d7efadf1cfca19f3de70f08320de7
+DIST mkdocs-git-revision-date-localized-plugin-0.11.tar.gz 369947 BLAKE2B cf0ae8d40818a234d8c974ec7fdbdae1c0a4b33c00b8421f0b6896c3593bfda3de2fb489cf8ee12875a9fa9362f92e27a2e9fb3ad29441f6cd4949dabb146fbd SHA512 c04a78f0e37f3603f0fc377d9a4f17093628c50b1c2488943f2d32fb7f996954bb482952af5311d44002c52dcc02b3f3e85fe5245bab3926118feb69f4c7ad8d
 EBUILD mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild 1278 BLAKE2B 001ece8dcc5772c25b91f72fbda9adf1e5fe4e53b3ca7ed979415d82b3bffdbc21441af35c2f20b2ef1693e70db3b38466609d49fd7b387a0074f1ac9591a1e0 SHA512 4707de75627f5e5222108414edb0710d2af45a05747a71f1749b477112ce68477f3ad74bce5a3d52df34c85d213a10241449b7abafcebaf33ee70f03ed0590c6
 EBUILD mkdocs-git-revision-date-localized-plugin-0.10.3.ebuild 1280 BLAKE2B 4e1334db9a2a00f3adcf20ed06d10cd338a5a7b5bc8d8179b9cba2a3336d4f8bcd8b36d82176fb0da54e7105142d608d8cd8a51004d25beba9414361a5d2490b SHA512 5f01f874e002967197e3ce44c6087f9e81682a2247c731a3ec1130faf35924c80ff2809563ae0eb66cf9f5c7942cdc2f9a7d51a8fbb6f8f198a738f87c02281b
+EBUILD mkdocs-git-revision-date-localized-plugin-0.11.ebuild 1310 BLAKE2B 3a61497bfdeca7ff7cebe99a4e40eb22ba92c57454bb6de2a38b5917a6d90727f5edef4075d849201b4a1a118ac3d170724dd8122a98e1b5b405e40e20e2b679 SHA512 3299e8f5ec2c8b3da81db76966c8a21ce8028df300b0eda663cccc0ec4557b479958a0c5664aa057e3c84ad05ef0e8cf8b43aa6e08f4477b785ab85bfa284d86
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.ebuild
new file mode 100644
index 000000000000..0891d6826ac6
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 423508fb314b..d7d06bd25eed 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-material-7.3.4.tar.gz 7319409 BLAKE2B 5e3805bdb4186637795011436281d5e2082fa7ec9d3f2eb07e2ee3ceb245ae1dbe81d461f59529fe2b821042a254b6d69a0838f01f470387bccca4a9a85179a3 SHA512 052245d69e7d19bdfa4db7e2d1d880cf49bd850ea79371cd222ecaab8964840e5b2b09bf4646f1a30f56b0161be6f3f163bcc81291ccbb0e6f47f7c24e741ab8
 DIST mkdocs-material-7.3.6.tar.gz 7391997 BLAKE2B 9ac47337287b724aa30da5c95b5fb54475fe96ac9c1b089f647430699b5393ea8859786214f47a4b32ed84bd509824d94cb876c1e3e40a3935e6669d24077490 SHA512 c29f30971e1e692dfca09408af3eda3b10211dba44f34aae42a61148008a0a3a020579c86bac8fc413a7938e866a9cf4630eab7a91a6e9a734a9ed52e327bceb
+DIST mkdocs-material-8.0.5.tar.gz 7523273 BLAKE2B 93b1f545e90784635a0f9b4c01a697310b18421540fd9563c5307806268af2e48e37c193979b8d86823bd5d875b1cc16d912aab52d108b12d6a796b08f8e7932 SHA512 6508b740ccc4ff7bd30c207cbe437d62c02140566cec047fdf0d98a23894825199b0928764f3fa1fe1314e9e95beaeff817d900dc5bf3d4b42b9b0e677eb3a47
 EBUILD mkdocs-material-7.3.4.ebuild 870 BLAKE2B ea8bdcda6766c2b1c01524366edf07b4ee11a8bf9d84f2d2aa17f27a703eb42213f836f373982dddf1c69a7240618e890af64c0ddd7597f85b1367fe47b6f6e1 SHA512 adad58d4567e0c89747160cf5f128877970b693a604758f44bf7f97b116ba4f4fbebad5400f5998c317c79c93404cf9aed125be612a285e5bd7c078a086d5834
 EBUILD mkdocs-material-7.3.6.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
+EBUILD mkdocs-material-8.0.5.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
new file mode 100644
index 000000000000..19ab08b7c4f0
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 0286988d5c20..02b0fba5ea54 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,4 +1,4 @@
 AUX mypy-0.910-py3.10-tests.patch 1821 BLAKE2B fda18540f14b0fcba8d57bb7e072135f7415ecc39750424ee03fca835ab65491fb8966326e7f51b260b7f1b98e9bc408eb04df4a74e6007a5c1c72b28ed8a950 SHA512 64a6b2361260b0ce9bb22e706b2531af4ac2894191c92501274368d92beb159e53b4da6174e7f91ef4b2f7752936d86250b5fe8347beea1bdf223b7abda98414
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
-EBUILD mypy-0.910-r1.ebuild 2058 BLAKE2B ed6b17b36e62f71371423b28e7d2b8a3ace044efdf9e7d178a3039e0563255c56d07c90590490836f2e8b286cb6da43f102f56b01bcebd97aacdf65092b9bf22 SHA512 f4e2351b28ce93adc4b0dd1977f2b4f64293a294e7b1699d9d7103dd564ab418fffc6d44285183c7ad2679fffaaae72ac65e79cd052a438462f52f40ad05878e
+EBUILD mypy-0.910-r1.ebuild 2064 BLAKE2B 1414bf4e87e49d283ad99c621792f1a8c9d47adff14f426949b3825fa8136db03bb6289fecf9cabb311eadbb7b11e4d808e5d5698224c4b028dd9aff2fcfd98f SHA512 48ac5b30de896c4e4191edc20f6c435aa7fd6d0388a99e00ed51e8d27d7a40298e7ae070c6dc786d6e55d62c0963b809a427f066ef96fc3a2e2d17a33164147c
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.910-r1.ebuild b/dev-python/mypy/mypy-0.910-r1.ebuild
index 27b8e89ee5e7..dcee802477a7 100644
--- a/dev-python/mypy/mypy-0.910-r1.ebuild
+++ b/dev-python/mypy/mypy-0.910-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 # Note: replace toml with tomli on next version bump
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index aeaec9a04286..4e902067daed 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 574 BLAKE2B 4f8d6be4927fb3df7452165a81bdbec5400b6f0dc51e50d5fcc4550d019dea9d018cd05621cfbcf1901636d85d62d6274fd2c2c1a56a8c96f78fb27db5b15614 SHA512 09a7b4a241687b59db4fd6aa3261a264897eebe23fe58329421f8c99b712f4b6810002af9451118c1194944ef2aae773a2eb479154a6b09033bc2cbdc62ed2cb
+EBUILD mypy_extensions-0.4.3-r1.ebuild 580 BLAKE2B 21e6dc5115ec58e031a7e31b95cd6198dc8c0c15538a591578def68901b6c2c52aa0818861d267559976672ceb10c2133e37920b70530828b9b2ce1b7acc556c SHA512 fb39a4681d903426ae761267e8dc1fcc4ccce99c5b6561c61b3de85cb4b77be23505d959d64cca9fa69235f9eded84cc786a44aa7ee35676abb24d7e66e602b9
 MISC metadata.xml 405 BLAKE2B eaf484f8baf4a4353f55fc7a84a40057c70adc6a5403e5f2e22f84d804f63774b60c52ddcdb4cc59fa21f3c350ea772f7eeb12112610d611c053ef82340a1e92 SHA512 26bd5e50dd2d591c6bcc803d27e85fa0508921c688d798e208868b7c9a77bee999ef12732038af42dc62fdbec75b7cfbbd6ff33256756736bcc783893aeaf586
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 278bd25dd11f..d22f9b88a42f 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 5780f63a1d1a..8328bb7116ac 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,5 +1,5 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
 DIST natsort-7.2.0.tar.gz 144338 BLAKE2B cba2a547813b56c3f42a6d9526be59ebda0e12f964ce72e166dec825ceab923b06f7be768e4071f9380e7b8c2a2d24a5b9af0ad0752e48655046bca44fd03ab9 SHA512 9490d4f3f304834a82f91fc7f215a9212e5e4a2c78e2d0943d886cff2f50c581171bd27edc8ceec23981ebaf8d13d3be2bf1954439dd76aef9a2cc9983b1968a
 EBUILD natsort-7.1.1.ebuild 550 BLAKE2B 1d323486d3ae0325aaaf984c133c4546467b2ddc6513c9a9ae509c4713d6d7c83633c00e5012107c65c519f794c5f3d974549864152e5c3249143a83ecdefe9b SHA512 cd62fde19a37b522cfbca7b4f0c551c6767dd3cb3e721b5a7a1cc29acc80349abe1b10839d728263258a15b2637491602beb4ab64b6d94b558dfb50111337736
-EBUILD natsort-7.2.0.ebuild 557 BLAKE2B e70c34da949282729693d323ef4765d7477f0386cdbda64b5a939337d66fb0642cb0220803ee03b95d1285ecb6b5b1435310e6db74ec8ed610c8e5ff51fbb2b6 SHA512 09f44bba657cd41d0e25fa73fc43ed8a85de64c2d08812b007d3b454f9610019c84afbb3c4e980cb0b2a3e9e41164509adf4a6746eb785f1fa698ba7f3961541
+EBUILD natsort-7.2.0.ebuild 563 BLAKE2B 0b9f7f26fb89ed04b1c84eb7032411aa7c18e4f77e5ff6554f7c94821272bf59654eee5c84d276eac9f61cc59c7526eb7afcca6f71ba202e76132f8fd1e15f61 SHA512 1f5e21c5a2c555734386465c4b858ff9d9c4cb6f940e299ab718062df35b0c43cfae51177c4e33c2ab6207af170ee388d60d648130e00b9e710e779244df3fc7
 MISC metadata.xml 407 BLAKE2B 385c6b60eff44662eee4337cbcc1f57cd7f1f30f129cb6a22e284ebc7bcbd2e5ae271c27b1b0405b3b4087df72494e3b447bfa1cf84f116befb2811c362ea4a3 SHA512 0c91866fb63b5b74f00a28dfb6bf1afde8b8a48ca830bd6bce7a2f8fcfd80982c51fb20913c467fc44c11f3a8c7f69e8544d21dbcb941b2e80cd8690561b07aa
diff --git a/dev-python/natsort/natsort-7.2.0.ebuild b/dev-python/natsort/natsort-7.2.0.ebuild
index 59e2abfb948a..e1a2a2c8074f 100644
--- a/dev-python/natsort/natsort-7.2.0.ebuild
+++ b/dev-python/natsort/natsort-7.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 4593e5083e21..7d59cf1cefd1 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,7 +1,9 @@
 DIST Nuitka-0.6.17.6.tar.gz 3148827 BLAKE2B 4c898cac6ae5934e45ecfd37222670d7665ad9f512ae4e7f4e94eb25d19cd434448dbdf188b74398c49eea3b26a393f4fabfddb879be4d2bd795fc1ae6a8538d SHA512 1e370b083861cc9953ab9b72c98dc81f9d6bbf97196abc69d8229ed2a87f2151101b825c8d34d3656cf3b1cc0cdcbbc5a4aa97fc1c32ce605b0535cbf2d3142f
 DIST Nuitka-0.6.17.7.tar.gz 3150990 BLAKE2B 130c98e0499380591f3d3a4d6acabd396749624eca7a0ddcaa997e27ce0ae05d22230edb4fc7284b89dd3bfad1ac16092b7db5ae7c7b7e7c7a41c1f5a16ea8f3 SHA512 08f99cafbdedaca2df2967f452038a69827f291ab825c31231b434e80f56da0698b458f129c2639d2820257c7dc86e306b507742d4d695002d5a64ab8747cb3e
+DIST Nuitka-0.6.18.1.tar.gz 3688411 BLAKE2B 4ddc98cfb34ff825c628200a72c8cb671a1053c7085a542bf49c96617155c69424b1de924cf6fb7fdaf5a5a52049781f687c1cda909fe4309410296e79f34435 SHA512 3638e6c8dd25a19f69eec3bafed22d758a1ec6c15d0491f91d9c6e5570014b87f6efd6d8944a3e85ade314f49128af8cee15b745e26660cfc466fc22bba3e717
 DIST Nuitka-0.6.18.tar.gz 3687825 BLAKE2B f2c5655c610083065cc205c0a92ff9c57edfc87a479592f435c3dd194e2d6d71ff0ee9866bc97f222b3936190a4420e7d69cf9413b5b2a5e9439448dda82004f SHA512 df4c81d890ce9c5dc24e648f65137d4bb91dcb92917859976a3400ace6c297f985cee4932b50cb3c2aedb2eaa806be7529a98a75a32fe3f59ec718ed3281003b
 EBUILD nuitka-0.6.17.6.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
 EBUILD nuitka-0.6.17.7.ebuild 1152 BLAKE2B f1645db003aae150d8f17e2d9697c0315662213de1276e73e0ce84934576a15e230a7d07a5f6aa1cc245c6806daeeb74e85d330c6aaf2812a9c473415e7ced1e SHA512 711c6e15d105e90841a15f700a48e39ba3829d37842811a92fda32f31ca63293aac77ff6cbf45cb2ab807843a6be6474b99ab24d23dddc0fbe4be27d1ac2a66f
+EBUILD nuitka-0.6.18.1.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
 EBUILD nuitka-0.6.18.ebuild 1122 BLAKE2B eca265689732d8818e79681ff96cf9b4987635e5f36fec61e1cdccd373223967e1a3269fedde4c61904f69ae00d109d8e8d8e8038f269e494288075f011161b5 SHA512 9309b5d5e4752512765f2c877c92f824090ef45e88e2452133a567ef7dcec51d5e61af559f4e13994d94c0bae4d8cf2634f14a4933a645dd59ac7221edc79173
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.6.18.1.ebuild b/dev-python/nuitka/nuitka-0.6.18.1.ebuild
new file mode 100644
index 000000000000..d42d1b9e532c
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.18.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 4c98d318ebc2..aca12dc2d341 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,5 @@
 DIST pillow-8.3.2.tar.gz 48783084 BLAKE2B c63930df3af0270bb092841b3c39a1ea75343ee743f9e4b083a2f6f621ad1e58c7c04c5d6cf4b648fbef2d79d7b5258e27d220cd32dbfff592b5ca70d1f28d64 SHA512 668e97abcd36e42dafa433e8814a0106fe742ab093b12748c13dd9f3f872d18f8b9d44c1a8d4115aa87969a98b53c36ae4783cc3804e2d9a1249eef300555c88
 DIST pillow-8.4.0.tar.gz 49364586 BLAKE2B f6a0fbafc0869c952bf88ad96146f27cf70c5680f372763bc9989cc49515bc74886a9d7648114797880ca06defc79e2e50d7ecf36bfa7adbd969450615ac0bd1 SHA512 d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
 EBUILD pillow-8.3.2.ebuild 2630 BLAKE2B 35acb4e2123562d6060a3987ace19eef820440419d6a12e12b45d49b43c97db02874b18161e40eb5fc528142b06564d90ff02c40efc4eaaba18d939bc0684ede SHA512 c92d71605566aed06473690ccfc80b4c7fea02b877e1a8cf287f35b6a263cb5ca28577cddc2a07d8487219a9573e0359eb7f6cd8cf47bedbc303775184f6c8bb
-EBUILD pillow-8.4.0.ebuild 2632 BLAKE2B 334aa21a60568484be6d82e1cdf2b220e05dd94d9c4fdffa33988d59ad69048bdfe5e5c51a48f5316ec7864da9189617edce6e5e31f98ee5ff8a6474add417b2 SHA512 ee8afa571ed79214c6e48933f3a7fefd6eb9dd546f9be6e02236e25f5c14415752b25f6ac246b9d25651a98ad8b23017ac6153798e99fd69bf5cec1bb9d92a4c
+EBUILD pillow-8.4.0.ebuild 2631 BLAKE2B 4361d4ede9d23ceb3ea513e4cee07635b605d559c697b16a8a71f188c3fdfbc1c7b30841622da82a8ef0be316c67066cd8bee90c7f2e0411de9a6a94f7d83ccd SHA512 682625b167c732487b2dcff9079d825649541351c8c9cbf9dfb0f6dac5de5f0916b526e7a334cf175e8b1b9a69eccd4a318309a6b1cca95ee7417376d43ada30
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-8.4.0.ebuild b/dev-python/pillow/pillow-8.4.0.ebuild
index 15dd89156328..8695442b4006 100644
--- a/dev-python/pillow/pillow-8.4.0.ebuild
+++ b/dev-python/pillow/pillow-8.4.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index cc93deb17682..dbc3ca67543b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -5,6 +5,6 @@ DIST pip-21.3.1.tar.gz 8961896 BLAKE2B f694956854cfd26f9b043fc28994448d2b2efff04
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.3.1-r1.ebuild 4951 BLAKE2B 2cf16db1fce25dd9b2e6c020d400e44778fa72bf78b0497098771479bad73d2e985d848cbdc4b27ae6b29ee08ac2eef24873441dbab5f9b8223b17b48b57a260 SHA512 9a8ee29e51f8853be563d5f8ac6023891edb2467337b6a39e021fd1929788b096877777a4c6f88e30a94d97fe53c10ca71cd763185ec47e265acd6b07794d143
+EBUILD pip-21.3.1-r1.ebuild 4957 BLAKE2B c23a88200f139830d07db7afee0f71c13f4f46492acb5d805b00dde6bd1cb876e2fb6a9d8a30286029d47568ae2f54b8cc6b5d6c485c37b8fc7c0bd463474a3d SHA512 e6a24b33e2449e5cb5030db32491e31a320aef1fe8bb65aa43222045febcc1ccdae2c2fb8ca71276e117da6f858244f9e71ea4857c6a6af9593e80b84fd3b750
 EBUILD pip-21.3.1.ebuild 5086 BLAKE2B fb28ecdcc8efe3ff881f853071f3d588bde8f32dc415919e39b0ac8f2e004c4b50ebe4c23a369ac9df8bca620578b8c7498ea44d9ce3012ed954b44645e948d3 SHA512 8bb100dcb2a996d09c5ddc500fc610646c3b8fdc00af49cc39bbc1bf399db761284392e1a2958a54a230498fedec16fcf4494c7e8017a51b71c2446d82484234
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-21.3.1-r1.ebuild b/dev-python/pip/pip-21.3.1-r1.ebuild
index e56b30120dfd..20a768f303ee 100644
--- a/dev-python/pip/pip-21.3.1-r1.ebuild
+++ b/dev-python/pip/pip-21.3.1-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 5ec22d26e23b..27cf738f8151 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,6 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
+DIST pyalsa-1.2.6.tar.bz2 40171 BLAKE2B d142d5818527b30b333d2552045892854df25eb14a7983320fe56e30a6239d3fe947ef1f0e1202ed3b5aad7722002e0e5e82ab9f89564bb9640aca2dc03c7887 SHA512 11b8eed822e0f8acc96ff0e10eeec0ba26b2997c7a0000b1d82561661f59931cd6b6aa6397b46c5944a0853344517878ede6c9ba13bea241cefc72b72bf1d9ff
 EBUILD pyalsa-1.1.6-r1.ebuild 662 BLAKE2B 31d89cafb31fcaf30007a2cbbee4c50cc7288f3f2389e3540a91dfb15f17fcc368590692422051225c7a2f69975293939dfb90e38244976da959c6ca3be6bd93 SHA512 f9d083b2df8e12bcf1725839bd38fa5416d42a83f9868e2e3da1292123ff767927ae7ebddd988a38c08595bd043e6684b19a51782eebac361b35d9568c79f9fb
+EBUILD pyalsa-1.2.6.ebuild 668 BLAKE2B 2c2fdd6b412df6fec4fb0be91d02bafa5fe7bc38dc769d0cc75066a494d73aa18a569dc4e3940a522fd38a1e4bc30c4f698543ce8d22f6588a13fcc8d7e3fb53 SHA512 550d8c6ab18b25c278e544429bcacf2700fc1cce9a3f2fbff586a7d45c8b711e3f627c622548db889214afe14f784649ecc080c49440f2393e23813ab9521962
 MISC metadata.xml 427 BLAKE2B bce956560d50c4bf87eb6ef026903b4d860350851d0124dbc6df20c8ad5a62851eddf5736b3e44fe0bf596bd82d3bae465041b2a53c9884bba1469b99fae3875 SHA512 6c6a1a1acffe544b1c4b39ec98fa3892ec53fc7c2137d5d987cbb6f026e69df638e3c3b43bda01434ecf4a202559c81aefe5b2d2113cf26da3e9636b31a4331a
diff --git a/dev-python/pyalsa/pyalsa-1.2.6.ebuild b/dev-python/pyalsa/pyalsa-1.2.6.ebuild
new file mode 100644
index 000000000000..342afe92b6d7
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.2.6.ebuild
@@ -0,0 +1,25 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.1.6-no-build-symlinks.patch" )
+
+# Testsuite appears to require installed state
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index acaa3ef0c903..af3de6ee94b1 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,4 +1,4 @@
 AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
-EBUILD pydocstyle-6.1.1.ebuild 820 BLAKE2B 58b217a21a388bd9788ebb7ac80bbb3058a3b5f0c310e754e55d35783b1190903eb4ec3ab4eda3104ed0387f637cb154b9b71598c9a96ce5bf2fe6f1c054887b SHA512 d45a1edab59fff0f7d6a2fd58e1e5ad165d03248a45ee0e5125fbad36c8379d8117570d5067f99365efd93a4e5a39543e42ff8d5b528f7fb60a19a90772865b1
+EBUILD pydocstyle-6.1.1.ebuild 826 BLAKE2B 6a4d74175b15feba62476f4b2eec62c5bb89e041a956c26ebe7c1c976a1dbc757acfc355fdeefa0f24eabd3df95ff2bf254d840a74bf3efd75e55ebc120164f5 SHA512 dafc7bd9640ce64d52f5f11cea60da974a2fa23d7ea88d985bf9bce6f676f324a893857e79d1e54a2b690579b41213eb8f44ed745f4d556e50ce408f9c130474
 MISC metadata.xml 665 BLAKE2B ac358d1ac5d68d11710048ccd4050f45cee96788829ee806bc5f4364c0f6b03707dcf15dd0cb9e7e3870cd9feebcead3c44b8f6bbff6738aa593079685c2a3c0 SHA512 7642d1384de3ec4bd55f7afc69ce67ad018eb9294f104234c5f3eb23a2c7a5ab36bda890a440fb5a7af8045d215048caf4b15bb3d965f414b755b51a269337cc
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
index c81da8a6c1fc..3216381e7135 100644
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index b6133f07f121..c3aeebedb8d1 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -5,5 +5,5 @@ DIST pylama-8.3.3.tar.gz 36292 BLAKE2B e9ed2156c90af1ef33b8a3875dffbe6ee939e70b3
 EBUILD pylama-7.7.1-r1.ebuild 1265 BLAKE2B 59690378b80f2a9dba5a7fdeb2abb1d518c94edde05a87b63e68309cfbd7293c672a01225dd325dfc46bd04542eadc4b0b46fedad8c4da9a6b627d8f8f47097e SHA512 2535a1bc10f6e15268befa691c177831e4595a429af11c23cbb38327560ae9ebbb7941b32369f9ef2a04a8e7cc9d2a31c2c330cefbe644e85111be3b3e1db1f6
 EBUILD pylama-8.0.4.ebuild 941 BLAKE2B 1a8c92cc513731c3da97e81dbcfcebc319ba154c3ce281421303f9250fd2366cfd0de06a432e8101d1125387e4c1d15a85af1752ae9fb032809fc04c1b9fc4b1 SHA512 f14c372b38b2d4ba28070c557ae6d8a5fdd74fdcaf09d2a0c1c01acde2e233ee625e7d5710c85c090221a76d065d1c8ba89650ae5d1e216b1b1c889e804f5daf
 EBUILD pylama-8.0.6.ebuild 941 BLAKE2B 1a8c92cc513731c3da97e81dbcfcebc319ba154c3ce281421303f9250fd2366cfd0de06a432e8101d1125387e4c1d15a85af1752ae9fb032809fc04c1b9fc4b1 SHA512 f14c372b38b2d4ba28070c557ae6d8a5fdd74fdcaf09d2a0c1c01acde2e233ee625e7d5710c85c090221a76d065d1c8ba89650ae5d1e216b1b1c889e804f5daf
-EBUILD pylama-8.3.3.ebuild 941 BLAKE2B 1a8c92cc513731c3da97e81dbcfcebc319ba154c3ce281421303f9250fd2366cfd0de06a432e8101d1125387e4c1d15a85af1752ae9fb032809fc04c1b9fc4b1 SHA512 f14c372b38b2d4ba28070c557ae6d8a5fdd74fdcaf09d2a0c1c01acde2e233ee625e7d5710c85c090221a76d065d1c8ba89650ae5d1e216b1b1c889e804f5daf
+EBUILD pylama-8.3.3.ebuild 947 BLAKE2B a18cf103a260f1204d1d9b03b8335a0c0645269986d835a978a43a682ce90a7a31d4be98d206f4c7ec62519b8180172e676b0f130c4607e0450410aaf426ca6a SHA512 c1f058fef74730581aee6494f227c763c30c2647dc331cf69b6ab6bd1a59e9976764f9e0753754dd48d0e33060c0c4c0af7ca7414fef7a0b45ac399cad299a4b
 MISC metadata.xml 389 BLAKE2B 4320ff9500cf2ec3d896d0ae766fd5c850b72c773a1626df243904f779db7ab9c28c2db462ab90f72e99b1da96b1131d8da207f9e3d14766ef9c33fe92c4ca76 SHA512 024823ccef87858b76df67e12452882ba523cc05a09fc128d8fe943ac92dc45abd9f3912cf6232fe411874555eec205b2623419d9e0d3247bae7663fa3775894
diff --git a/dev-python/pylama/pylama-8.3.3.ebuild b/dev-python/pylama/pylama-8.3.3.ebuild
index 56e1af7e7500..fab10b0885f6 100644
--- a/dev-python/pylama/pylama-8.3.3.ebuild
+++ b/dev-python/pylama/pylama-8.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~mips ~x86"
 
 RDEPEND="
 	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 2486fc17cd5c..218d73a6bdfa 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -6,5 +6,5 @@ DIST pylint-2.12.2.gh.tar.gz 1032702 BLAKE2B de7dce04159b332baa5c23f4034ee249e49
 EBUILD pylint-2.10.2.ebuild 1455 BLAKE2B 56c90397b6311ca6fafcc0872738368e9aa1bcea78dbdbf684312bbfd64e1974c65dc071af5207b16459d0b0715f281ab98a6a34c64dec30cf9488b4ddbe3264 SHA512 60f9614a73ea024582354c5e6f28cbf6bd1438f7e3dc2164fe5b5f30664c879b261e5944dc8c5c87f4fe7786801034e479a9bba8992e03e576fa545d179d8662
 EBUILD pylint-2.11.1.ebuild 1463 BLAKE2B 7a1f4504c86aee1e6e515a49b5fa7ba3b2f56afc93f2da7fa0beb2e61dc8c729fa192aedf00d43e64618603b61e5bd82fe8690590d2dc70d2e8b4bf03a6806f8 SHA512 15b4c303bbdc54875e5f6509effaa7291a801810e10e07ae3b183f0a786f038afa52546cc13e47f145fd33d032a5e89e7a0538b61c65dd1d2695a762d4cccff8
 EBUILD pylint-2.12.1.ebuild 1719 BLAKE2B 5e094e57e6f2eb5a52f7df2ec286abdaba56782cdd1a5cb9c82be2cf0861a849011de71a6952f7b63ba42031ec8bcdec2fac3eff4c7be83b08ebd91575a81fb9 SHA512 5466523a8c2e4af168700ef98e6f74cb04afa5365fb0840753b0dc14e253258c357e85817e80ac8cebbc07ee016ae601a8e39b85e98badcfbc8d6436f461738e
-EBUILD pylint-2.12.2.ebuild 1719 BLAKE2B 5e094e57e6f2eb5a52f7df2ec286abdaba56782cdd1a5cb9c82be2cf0861a849011de71a6952f7b63ba42031ec8bcdec2fac3eff4c7be83b08ebd91575a81fb9 SHA512 5466523a8c2e4af168700ef98e6f74cb04afa5365fb0840753b0dc14e253258c357e85817e80ac8cebbc07ee016ae601a8e39b85e98badcfbc8d6436f461738e
+EBUILD pylint-2.12.2.ebuild 1725 BLAKE2B bcac521df8a8ee104e92545c5e2996e64d80dc3319745bb6b3351bae6f320859260bb6d7ac435685bacc6c20b065a23eecac490a73963fa2505762030a0280af SHA512 6c888079bf02f4c597f3acc907672250bbe8e002a3dbeecc846c7c65eda1fa2896d1784283a2a9f6cfada4293d8dffee97f83a91eac505ce258e0ef9630291d0
 MISC metadata.xml 1100 BLAKE2B 98ac44b343a44471afed50ea76c658142056bba3e3e0a75e7a3854c6e196eb55eeb466611c4d2976787fe4e5d4c13c1f434cad8afaece76f3ba04cd94197906f SHA512 78b52b43ebc944c60d037adb4874fcbe72a2ac713b713ac3b9a226966db2fabf0b31a11e16dcf26243cc19c62841928ac4bb32f5eef69f9d6ef9cb0222362bbf
diff --git a/dev-python/pylint/pylint-2.12.2.ebuild b/dev-python/pylint/pylint-2.12.2.ebuild
index 509785607dc0..3d73abe039af 100644
--- a/dev-python/pylint/pylint-2.12.2.ebuild
+++ b/dev-python/pylint/pylint-2.12.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 66645e91f525..5fec2b42f473 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,5 +1,7 @@
+DIST QDarkStyle-3.0.3.tar.gz 431182 BLAKE2B 3c9406aca5d01c3682123e044d2e5417b300b724c6366a411a00211b482582b26c687128f6c32e7a95a29fb70c3a322fd525483c48120e5671ddff713e4e0035 SHA512 2c44a4469971b127f7fb8c9a5bce452c98653aaf29dcdb7e0df2da7557d6730d64ebf6a649f8516fb13a2d4e77d0fdadc293457d94406d8e7491be3fd52a9313
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
 DIST qdarkstyle-3.0.2.tar.gz 8330772 BLAKE2B c64524e2ecc23b714d6f5df6cea007846c6a9b1d5805d12e23c53e27c0411900730c656583bb5446bc343018e4fb1e110994c646e277ee0f3a3a7553df77f3ca SHA512 ef4ffc82fe3b72d89deb5dc98fc7319dbd6dc0bae530bdf612477c44934f587c497f8a9ec9d060fc8fcafdc918447f4dbbab20225f1e5cbf2146bcde83d0ce20
 EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B b22052ffed55f621e0485e5408ac225a30aa8512c7067c7fe7ecd51aa370f7c2aa9a3f791d6af99b3f3e3ce0d595d618ef8d3c28488cdf55c48dbcc384b3cc6e SHA512 310b02d55f42ae6c7df703636ef6eb02a874958515d5e5c341db8f9cc4f8d777b179b4e2ddaa21761938e7a6e8920ebe1075ab637188a8cb4fe18aae5ac81f70
 EBUILD qdarkstyle-3.0.2.ebuild 1236 BLAKE2B 0c83ad8fdcd8ba37e215477727a809b08c7f7527a762199dd60c73c9c22262251198cd719ebf90bce89297d40080e5f69efa4d0ee7d071b6c66ebcaa38ee492b SHA512 1b6d40e34e7bc7e4df1a737854980fdf3cec8ad7df25ccc5e8c1c852861f2fcfd4cf820b491664ba8d0d4eb44a4122bac9ad127a5e3da88a0aaa4de25d1cb4eb
+EBUILD qdarkstyle-3.0.3.ebuild 1153 BLAKE2B 77c2b725340320caced8c3c7da613765f57aa3eefa32a335c69d7956be73b97ce6c7066622edf261451d995e0c731f1cb9260d39216897e584fdd2e49500d797 SHA512 8100e91bfacb4285b2f8567cf2e976f768978e383793aab73256cfb9efed9f8228dd0b1f74a44ba9440ace761b38286a9369775d21e494e2342ae1700b0ce7f1
 MISC metadata.xml 356 BLAKE2B 16d4b6d558d5acf0b812a0e739f6073445ee1a9c02fa9cf334d74f29cda84e3a1cbe9e8a5f6c9d09c68606a0273f83f528b738c524aad97fe2365d855d627984 SHA512 487500f2a0f1d7b2389f5a0b2b9da6185746a4a1702037ed3ab982635c9663925cf999a7df400aa98aa0d4ff2b2d2bb0fae7c14f1a6c4d47d4cd8964f8e1471c
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
new file mode 100644
index 000000000000..25c68c9ea48f
--- /dev/null
+++ b/dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
@@ -0,0 +1,40 @@
+# 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 optfeature
+
+MY_PN="QDarkStyle"
+
+DESCRIPTION="A dark style sheet for QtWidgets application"
+HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Figure out how to get this to work
+# Please pass a palette class in order to create its qrc file
+# This appears to be fundamentally broken: test calls create_qss() without
+# argument and that function does sys.exit(1) if the argument is None.
+RESTRICT="test"
+
+RDEPEND=">=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/qtsass[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.7[gui,testlib,${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Retrieve detailed system information and report bugs upstream" dev-python/helpdev
+	optfeature "qdarkstyle.utils" dev-python/qtsass dev-python/watchdog
+}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index c478672c347e..f06f5cff600d 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,5 +1,3 @@
-DIST tikzplotlib-0.9.13.gh.tar.gz 97787 BLAKE2B ef767737b8d222773f2d5e02dbf80ac8a48ea8a00077eb245e5817337805deb5b9be27e7ed76354808647ea1ed6b17d3bbca9b33799d294bd924c18b224e3621 SHA512 f9b4c46b3179626222713dd771dccfa6b0c34ff55658838aba74867c7cd5b91dddfaefdcd2c41824c9f13a795cadd6720240beaf3d504a7f735a2169c441b449
-DIST tikzplotlib-0.9.15.gh.tar.gz 97906 BLAKE2B 6ceac71ff62eea1990ed1820c1c6b2bc7891787fb6604e2e32c4a512a6ca6ddb66800a0208145eaa36c3c8c646a84907b08e747b1d081189a49fde25649419e5 SHA512 cf42bca0be45e6e79e425d0e2da4ffd42868f081186d91dfbec8de20fbff9ab4a071267bb290240b080f9d86bab15e08d757e905690c37f43c0dac7e724ab609
-EBUILD tikzplotlib-0.9.13.ebuild 1026 BLAKE2B dc8f843202329d079d0aa5a2b045ba3695d04ca58add84a0dd74c0729baff04f0d17d5d5d304cb2da7702cc11701bc46a0b233e5845159e3c68cc2fdcdb3bbbe SHA512 f00b13a59a7bf5e5e0ba96b669d8c827ca368b0f0f479db6cebde982519800fb53aa1576e13537ad9416eded1b23e6e8caff5e96952c961844483d8f843c3374
-EBUILD tikzplotlib-0.9.15.ebuild 891 BLAKE2B 7b984cda440ae7f2d3f37bfa79b6ca31a3bb138055ba39d2efb75e9979f8cf26d9d58b8a00ac0e12ce79bd40c5f1ebf512285bc704c7a0232562d2d165a4314b SHA512 3fbf455b282f744ba8c193ba42e713815ca56b8bf10668639afd5ba7736f779affc2c457f82a3a43b65e50ebf67c89dac7f441f61f7ebc1090cb48895c14b26d
+DIST tikzplotlib-0.9.16.tar.gz 98162 BLAKE2B de32064cd8cb6f3fbd8e067c8126a86da6d9836dc42d91d42fd8ad6ba9f8fc2a1001904d370cb756e76112a0d746247f6235fe40af277a7142bdc6264b1ee531 SHA512 7633b7e8ee23aed8da3df249a7dbc4e36667950d2c5caef5845b5468a61f5cb0191cad3253cc7940d19be56a7981d33c70c9d45ce0d9329286266af6f36c2d94
+EBUILD tikzplotlib-0.9.16.ebuild 889 BLAKE2B 2d4df182606651831e5d8c26637c6889c6100112fe69e14ed85ddf8a82b52419d2ed20a9c4e8341838092f508ff5b91c6dd2f6c25a4adef03e64e5ce517f8d8d SHA512 2e61f0d077b5ed3dbc5241f74e0e7db62dd9dc103a9535715f9b17f525c7d67b1dd57bdc17295ba0107b7d679d0d1c07e0dedaf2600140381005c68c5d8b1fa5
 MISC metadata.xml 972 BLAKE2B 58a15fb4ff395c481a755bb9d25c08cb149d4e6fd3db47cafdc4a477dfbb610f78eeb1334bb5742696a8e5e9ceab4f1653a668b93664baa8aa36d11cdf350e31 SHA512 2c363093ad18d3fac9413548e628b153540b4283ec5900cd6f375219408c00176ea9abdb54d576dc764aa713fb33bf8f0dbfc6c54a355f1c2d3dc7e6b5f089d3
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild
deleted file mode 100644
index ddf06a6ca882..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="
-	https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/exdown[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	local EPYTEST_DESELECT=(
-		tests/test_barchart_errorbars.py::test
-		tests/test_colorbars.py::test
-		tests/test_fillstyle.py::test
-	)
-
-	virtx epytest
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild
similarity index 84%
rename from dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild
rename to dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild
index adfccd0097b4..22f8a8cb1971 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild
@@ -10,9 +10,7 @@ inherit distutils-r1 virtualx
 
 DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
 HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="
-	https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-text/texlive[extra]
-	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	<dev-python/matplotlib-3.5[latex,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/tomli-w/Manifest b/dev-python/tomli-w/Manifest
index f92837cb7ad7..fa0f3d122465 100644
--- a/dev-python/tomli-w/Manifest
+++ b/dev-python/tomli-w/Manifest
@@ -3,5 +3,5 @@ DIST tomli-w-0.4.0.gh.tar.gz 63717 BLAKE2B 13f73718e84602e65243708481c5463791207
 DIST tomli-w-1.0.0.gh.tar.gz 63862 BLAKE2B f10dc80ce76edafd78fc66dd488a35bb0e1d8bf31d0cc0e3b970be19f5cda40d992fafd46d1361b55df4a787d48f38260ac2be77def7ac938f62144e4c810897 SHA512 406f81e4e8151e55e8367031b5880f51de41016711238a114c82962012de4b90d5e465c503a8979d565d07843fbc4804a53c29848e4f6e5f20f9ec5dc5ce536a
 EBUILD tomli-w-0.3.0.ebuild 550 BLAKE2B b04e0d74af91b4d9ecd25b9709b6423d267cbf8e2e0b94e68ceebd3ab14a1077c058268b9b71228eb3bd6b21f44b7fd6e78acfdc6844dd6b3da2de1e1ee736ef SHA512 dc680e42111bc4a14db145d9bee7fd2c153a46984cc752121384967108d2f8dc0d9fc4931f9bf43662a74fe75434ec3e459d1b7eae9ae85a5dc69d131b38dfe1
 EBUILD tomli-w-0.4.0.ebuild 606 BLAKE2B 6ca1e89c4b797de53043de47a733b015fe18284c4109229ddef74de77a6e0d13c0d999437890f853c3b17a90ae59a1d28b16f94cf40fbf4ac7eed75383b3fd6a SHA512 92e1614a8551815d6a5b331e2f26ec9fa019a40f2a0c21b2859400437aa9f4a51c561b82c7f76b94c6a501988f78915fa1cc702d95fd9bddd22c7255362ddd9c
-EBUILD tomli-w-1.0.0.ebuild 606 BLAKE2B 6ca1e89c4b797de53043de47a733b015fe18284c4109229ddef74de77a6e0d13c0d999437890f853c3b17a90ae59a1d28b16f94cf40fbf4ac7eed75383b3fd6a SHA512 92e1614a8551815d6a5b331e2f26ec9fa019a40f2a0c21b2859400437aa9f4a51c561b82c7f76b94c6a501988f78915fa1cc702d95fd9bddd22c7255362ddd9c
+EBUILD tomli-w-1.0.0.ebuild 612 BLAKE2B 337bac721aac8781665f58e9282963f161f319b1f5cd9f68f1892956bef3946a647e47c2e422ae83fc88509d06c1b675109fcde157b70d3e33f2562df7de2d83 SHA512 77642eeb1ab1ed4a16b3c303a1d87bd4b9cac268747013144870dd509cf236c04806565e502d98af6ab48ead2753fbf8d0e7b2103a39e0df5ffd99813cad9bf4
 MISC metadata.xml 367 BLAKE2B e088ed9141a1b4ad1506ce67b48a6666c9bf9c84e761906a95112a81d4cd9b98ebd0db756cedf007c3f50e39321697f8fc91ef6e49e668ca794ff78e8b03080a SHA512 784aff95fbc1cb65e4eed20258499260400fe31feb96acc6fbde00353d629595d8e23ecc6b550bf608294fc882c42063d0a23699defddb6699df59add7e8acaf
diff --git a/dev-python/tomli-w/tomli-w-1.0.0.ebuild b/dev-python/tomli-w/tomli-w-1.0.0.ebuild
index c7fe066b486f..44dbad289b54 100644
--- a/dev-python/tomli-w/tomli-w-1.0.0.ebuild
+++ b/dev-python/tomli-w/tomli-w-1.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/tomli[${PYTHON_USEDEP}] )"
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 420a076981e0..a2855dc4075c 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,4 +1,4 @@
 DIST tomli-1.2.2-py3-none-any.whl.zip 12118 BLAKE2B ae1dbc14e3c7c79240a327f3fb622c16aeba561274aedc93957549d838fcb2b6ed5889f8c28344a4cc9dbb52eacd6b9dc53aeff8f08642a8abeed2dd67c989a1 SHA512 fb9452663a46760ea442f2f06ad2f60b094368680dae315c2386457041f3ac5399c196ceec0524d432442ec72158c2d95bfa5d0cc288163b4eb1d6a07a62ae36
 DIST tomli-1.2.2.gh.tar.gz 123150 BLAKE2B b07527a2a83615030037867c6011440a3814cbe265e8a760cca08e324954dbf7d1a393bc900559ddfc1bcbe1911f758948051823d9ef830ee05abb2539374dff SHA512 460ad8ae9a342d82ef12911c0d0e246c1434a5d40d898e91f6c05bf37b7bf9921da05e004c36907d623a797a7a215c1c3faf3f9a2b940f3867b142847a188605
-EBUILD tomli-1.2.2-r1.ebuild 954 BLAKE2B 5d91ff6d926656385513e38a8911dee14bac9ccfab70398669ff1ae134ed1c23c2ed1803ed62b1cd14571bf6782c583a5fb06c71676bf9b435bb4062b11ac8db SHA512 dc74c808a098aa0cd60461a50cfda89cfa6d83c34259c0988de2bfc8d28c02d5263328ea812e30b637eab214fbae6f72f32f40d762d0f065b6989c0ad639c457
+EBUILD tomli-1.2.2-r1.ebuild 965 BLAKE2B c15022609eeb199cd41140aaf9a1cf2280b94306b2e95b6be052cabe7222ab84ad4e15e25bf1564523a9336e420eed404da0db616ebebd58ef08715eae345c8f SHA512 ead7429b878ab3409ba9f438d66f55ccf7815c35b03c02915ad97298ff505a3e6798608e9c92747a05def3635de5cb883b8b3fe91d85b219acd29018ab38698e
 MISC metadata.xml 363 BLAKE2B 2c80a2c2a8959a93e392da0e03303ffdae0a3291624c284f91d747d13983cbc188d8a64f8763ea484f792d5a42e355381034f69fa0acde382779e4ae53ac2154 SHA512 42e8d4b4d1ec773b53e8e119ce6afb74acd64de998c372c6f6ab64f70713dd825420d1e1af83b5f647dc03a917b1904d65f0cd06cbddea47a33a558be2c89562
diff --git a/dev-python/tomli/tomli-1.2.2-r1.ebuild b/dev-python/tomli/tomli-1.2.2-r1.ebuild
index 8ccec85b8b13..5f04af17414d 100644
--- a/dev-python/tomli/tomli-1.2.2-r1.ebuild
+++ b/dev-python/tomli/tomli-1.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~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-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index c0285bbed886..2f2ed792f0e5 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.2.1.tar.gz 45921 BLAKE2B 3717daac2aafcc13cfa71cd5678aeef7e6dd1933b072c40aa26bb315b2e2c84dea5734299fb954179b22a659fa271734ba78724e5f9d92be7a35efe1f611dd8b SHA512 fdbeb7ac2add27478a17b388ac62e9378094a368f29749d8b63c274ee41836506369dddd083956f42f1f2d74948392b3ddd59b801c98f9e028c126bdb54c636b
+DIST websocket-client-1.2.2.tar.gz 45971 BLAKE2B b62ba2d7b6d1b0d7a95f9350f1304cb178854a459bf4fb601b0c56404cfa2ec52824e6533b5f546b3f4e91a9b4a40072782640acdcdd170911a92efdea9c2ca0 SHA512 a47b70f754ee5b9f954a6b5a7cb788db21765776be8f3564e6a339ebd3a6b46c7b363eef208f92da4758f21e9923b97be08554586d3b30e9ad2251948a054add
 EBUILD websocket-client-1.2.1.ebuild 694 BLAKE2B 4c237d7dd6647bb2e5635f8c918869a874233900539903660c6fe2cce9bcb0b5c42fc26d5b2b8eaba510764c5a0b2e1f05635094a27039fdcfdbf248382c9fd4 SHA512 69543c3b2ae50ad8ae7a5553d093aad0dce3029e79594f2b30bbe69310be96a0ce062292aca67b4f345fa1dddc5410be7beab1ed87c44f692da4de7b6abc5d78
+EBUILD websocket-client-1.2.2.ebuild 697 BLAKE2B 3a11d13d34fce4dfc21bfe471483fe70fe74977620a56712dd84b3265e1aa8844f2e9dd7f35d2275a2b27ae78a12c0c8a63d7f6cf0899b72ae9d49241f78a383 SHA512 06c99a4ac2e46855e74557e55364cf45ac3d28fb1893d3df9780c11dd53d89d0a8ad52e15e05140d08bf56553b7df1d9b814639dcf783409a33b076ace1e668b
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.2.2.ebuild b/dev-python/websocket-client/websocket-client-1.2.2.ebuild
new file mode 100644
index 000000000000..595cb1e81497
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 0ae3b3a1de28..074c64026c07 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -2,5 +2,5 @@ AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
 DIST wrapt-1.13.2.tar.gz 130624 BLAKE2B 7ad74653208042326630ae4464494fcdd5299b35a42d495a16a3cbd68bb60fe5ea17f3e95eac85d98142fe339a593a8cda7e3182ce2a6e96f6ba2bb204a1fc46 SHA512 14648465745af7972ffd449783a24a4b5bf8187cbee517d3427825409bd5d073e3153a0c61f5583b84fc6ca2c48479ebf112977ce340369019a617559d09dfc0
 EBUILD wrapt-1.12.1.ebuild 765 BLAKE2B 54e2d2d3ce53c7c234f48b305bcfd1c0b1c2a4ea00697816871580dc5347f428af4729ba5f7c280e31420ea88221a640430b8e98472ebf2ab85da2ed882e6253 SHA512 0ec5d5a96394877bc7a29b7feedf13a203d7d0c8282d3f452c70a9026234f6888187756232a98e94bb90c459c2d9c90de9000722bb692fa70e826bea8518d640
-EBUILD wrapt-1.13.2.ebuild 692 BLAKE2B d1fec1b1d0d38b1f3e2726a26c5f0ad62ba5e83813c238f878d0b52c19c8dcf599aabb8d52d44c9d5f03df25cdde6bbc9afe4100154e63c6832262ad188ceb32 SHA512 652dd27c67cad4b8ca6b7f86e265fd16793ea2543c185a27fe097b7e3a77d2fd52d3027579d8ff0f241fa74a8f4d93b3e391f5d36e11b656da1b31f6702199b3
+EBUILD wrapt-1.13.2.ebuild 698 BLAKE2B 6bdb354ede6b31faf464fd3ef775aabb0884658662fae939d2c0a4d8a06145476c400a3cd125b345ec477b3b4b489cd91801fa4a3baa5add0483f086aa56555b SHA512 c9a91744f730b9184f99e776b4146b79e05c487a54aef71587e62c5fc11b17fc726405dac7b277648f81495a69b172f242d594d8436f529c2368b050bbfe2804
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.13.2.ebuild b/dev-python/wrapt/wrapt-1.13.2.ebuild
index a406c595a65a..b5019252ff93 100644
--- a/dev-python/wrapt/wrapt-1.13.2.ebuild
+++ b/dev-python/wrapt/wrapt-1.13.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index d701cf1dd2c7..0d054c1cb711 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1,5 +1,7 @@
 DIST yamlpath-3.6.1.tar.gz 214053 BLAKE2B 5c72ffc4e4307f1a3fea7a697782c432402acc1ee929de34a702188d51287fd7187b688354533163b7101dc17ed394f0e2681a1a194807f00762bf6c71387292 SHA512 8ef8e1931118ed881d52b6d7f589b1c671694c211cb1c988e7e6945b7ff5408163bd402f52c1815b453bf8ccc61e8b8ed5c19a00be076d8e76e0a037461a12e2
 DIST yamlpath-3.6.3.gh.tar.gz 214734 BLAKE2B fd36d276831771c81272a2bb60a9fe7995c63f1026143925e34167ee397b56725ec9ba5d5afac2a85121512b8f8da3f988fd022dc2378ee80b91567f15d95c1a SHA512 b6c41b550339809e3a0bcbd7dca190956f06799303c1c12bb68eed567c56ccafd2acc2a8a6ab33fb03abde61b3de25673ee2d459f6d66e6782f9325212653ade
+DIST yamlpath-3.6.4.gh.tar.gz 216016 BLAKE2B fc6537b7c80ecfb9f69c646970e43935374bb105df007c123cf837eb1de6827ac2cc443294b69500c966ea6bc5d7f56498aec13340238c7660118f17cc6685e5 SHA512 eb1ac0d5861818f4f4b57b07f9fa7f758846982abbb3ac4ec58a1adaca8ec36deba1e21ce3e13916e74a946512f4d66e341a9d45392ef7133d0293e5fd6f66c9
 EBUILD yamlpath-3.6.1.ebuild 1365 BLAKE2B 73ccdc94a1b063a65813333494f009b0514eb2fcc76a7e0c544007b5caeb9a7cb7f071fe1078cc891777dc48e3577a26697d0849eb377a904cc6ee84d602b46f SHA512 ec30e9533015048d698b7ccddbbf2d4228bfbf56e112a22a12209ad3d99d50e7ff50578b10bc7801fb4c90ddf2995bc6b0dfb0dc52ddde53a06df9fc811aea67
 EBUILD yamlpath-3.6.3.ebuild 1152 BLAKE2B c17ad924d0b66cced0f5932ca62c08b425ee887a5f29d2f6d01abb0d816709487651057de63bc8dcc6146d9a91e26d18699d6ca62405c3e37816c2ac96fc2416 SHA512 17d457d9ab28505b6e6a254cdb358180e8ed931704071a9acb3e5dbdeccde24c19141a02ba2d0ea9cca49d47eb8a3bcc49d82c2f4a3d3ec8f16c292f45566a10
+EBUILD yamlpath-3.6.4.ebuild 1152 BLAKE2B c17ad924d0b66cced0f5932ca62c08b425ee887a5f29d2f6d01abb0d816709487651057de63bc8dcc6146d9a91e26d18699d6ca62405c3e37816c2ac96fc2416 SHA512 17d457d9ab28505b6e6a254cdb358180e8ed931704071a9acb3e5dbdeccde24c19141a02ba2d0ea9cca49d47eb8a3bcc49d82c2f4a3d3ec8f16c292f45566a10
 MISC metadata.xml 563 BLAKE2B 5b63f4324ccc2685c7e11f4a75b105f9e97b860a983ffba37f1ae862082ce4654d0114ecde9fe7dc66e1c8121e607ade520e3f34192d2e85ebd538ff0631f355 SHA512 f50a3f78e2fa6d4f06fb1f52267202781d189942135112b45f17ed620025b87637925d3205f151573fee635b5f7b4d2ef1de5106223cd13d2f8e2963a31d29ac
diff --git a/dev-python/yamlpath/yamlpath-3.6.4.ebuild b/dev-python/yamlpath/yamlpath-3.6.4.ebuild
new file mode 100644
index 000000000000..aee7c4907046
--- /dev/null
+++ b/dev-python/yamlpath/yamlpath-3.6.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Command-line processors for YAML/JSON/Compatible data."
+HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
+SRC_URI="
+	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-ruby/hiera-eyaml
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -e '/ruamel\.yaml/d' \
+		-e '/pytest-cov/d' \
+		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# install and optimize yamlpath/patches/aliasstyle.py
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+	insinto "${sitedir}/yamlpath"
+	doins -r "${S}/yamlpath/patches"
+	python_optimize "${D}${sitedir}"
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 690a45d5b581..98178ef68af1 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index f8468e11c7ba..7c79c501c1d5 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,5 +1,7 @@
 DIST arel-helpers-2.12.0.gem 21504 BLAKE2B f2897b70e679df8a58ace7b88204a3345a2f22bedcaf13ef27f4176a5f02a716e9c7a0b09c3d242c8bef96cc6423a513820d20b15999415d99eb3d61b3b93889 SHA512 6da9d69b49d18f70dd911a5f1cf6edb29055423b6179858ae65f8f826f9c98fae7b9d4a7d6f1365c5efe382adbaeb42f30898c2329b721941428b0a6f58b3aef
 DIST arel-helpers-2.12.1.gem 16896 BLAKE2B 32809d895c630d8c5d3d1bfadb70d4b37fdeebe41dd3be303abd20295cb06e210ad48db8996673d5ca851e247420bf65ccbe0a7b3da352943e56094b38937911 SHA512 6d10bd57d74ccf1780927aa1fdccb4697a2e9cdbdf93bcc392b9453890043a8a6a4b57bef25d43f1f7d1597ef92d938afa9c67c54140b9e0b36b7b23c2de1837
+DIST arel-helpers-2.13.0.gem 16896 BLAKE2B 3cdf4164b20dcc3511e058666486ea0d5a5eb50a7825d56338715f5bdba2dc5124ba030ea0e27480225be9d715a86016ff0eb85d0e60f07bdd5f3f214c3f5bcc SHA512 31e88e136a85f49e6b8b6d7c244bf98744cdf0546f0916ff1b403904330a1d2acc4a4d97ba5eb59190b9c0592176e4872d0463b4d4662b63a99f9d3bbcc29c15
 EBUILD arel-helpers-2.12.0.ebuild 826 BLAKE2B 2888cd55047b4b42a114e80abcd301373fbfeaeeec8b6c05598c7afd273f9138f447944602dc8515d9d240e9c3abd51e5042e45a9020f42739c635d3a2c6a5df SHA512 92964c801c801c379717eca89429524215dea3d1f7a3f555597a189aa2cc5f8f330f9ef5df817dc74369e3b780ff090920092eec8d1d80f17ca5fea93f88a100
 EBUILD arel-helpers-2.12.1.ebuild 819 BLAKE2B a308c185656509a320fd17400f1dc93399f87993886c5a0885cce27658576382d8d013545566d2af56044220672423934140b2c4165cf874faf0f2168903530c SHA512 2d57053686ccb6499a37ec2b7649082d2682aee4331d2f318c31c42f7c04903b04cc107d711a4bbe7f711bd01f7310eb397c2c9861506e0069f88bdc82f8a83c
+EBUILD arel-helpers-2.13.0.ebuild 819 BLAKE2B a308c185656509a320fd17400f1dc93399f87993886c5a0885cce27658576382d8d013545566d2af56044220672423934140b2c4165cf874faf0f2168903530c SHA512 2d57053686ccb6499a37ec2b7649082d2682aee4331d2f318c31c42f7c04903b04cc107d711a4bbe7f711bd01f7310eb397c2c9861506e0069f88bdc82f8a83c
 MISC metadata.xml 345 BLAKE2B 4f44dad77778d15d8011c1372ed51e02c20313b118be5abf981c5f4727da135ac60218922c264b4a95ca7c8410893c8e105fbe39ca0c15951ec8f6063b1c577f SHA512 6d8f2dbb987e8a105515d4af49c2913aadfaef04c424ac2b4bc449ea3c7d37f283bd44f7d0225caba26774b9c71c8a73a1e38eeef6b82c1d849984d203c0f6b5
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild
new file mode 100644
index 000000000000..2ce0bc2f3056
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| (
+			dev-ruby/activerecord:6.1
+			dev-ruby/activerecord:6.0
+			dev-ruby/activerecord:5.2
+			)"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rr
+	dev-ruby/activerecord[sqlite]
+	dev-ruby/bundler
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
+	sed -e '/rake/ s/~>/>=/' -e '/appraisal/ s:^:#:' -e '/database_cleaner/ s/1.8/1.7/' -i arel-helpers.gemspec || die
+}
+
+each_ruby_test() {
+	bundle exec rspec spec || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 0b297eba916c..997f0cb659f0 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,9 +1,7 @@
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
-DIST facter-3.14.19.tar.gz 409345 BLAKE2B f977bb36ec8042ac950babd19ed398b8bd4fece854304a8a7a5f6b7608c3ad6ba4999b9038e401d599883da5bad63304b502fef164d1988d68a8477f1ff302a1 SHA512 65efc0237edc8198165e8229ca5d64e165a36e58718a863e14df9de9b64d4c9fb911d084e23daa982473f0703077b2cb0a5de8c544161591a894d537312c30f0
 DIST facter-3.14.20.tar.gz 410552 BLAKE2B 8ff8422e9066ab6fabe00e22dedb4c2970e126eb06e307df52ab2b4f989f18a8f6b405fff405702720b6d25503b663791f5d0ec94b07d32759387bebbdc302e6 SHA512 14073dbd628e0c211fc95b5dab2a65bd549429a933c9f745cfa62c6bec7a810f444626c165117efc05ad67b3aef2dae5398112911059826f1b5d2bee9b27eedd
 DIST facter-3.14.21.tar.gz 410594 BLAKE2B 30b502debaec476d7ba03a73ad3a251aeabf3347c2c552204e825dea8d85807d50cd6d06de03be32a5977e5e8cefe4869e2cc453b1ea79b9045c80369df6a0d7 SHA512 69618e54d2c46ae1230fa99ead88413ca8d5be6a01c149fcc00a7485767b9e624283fdf6064679e825a1ecb426be59a86e7ef903cd0ffca58383006ba5e9cf7f
-EBUILD facter-3.14.19.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
 EBUILD facter-3.14.20.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
 EBUILD facter-3.14.21.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-3.14.19.ebuild b/dev-ruby/facter/facter-3.14.19.ebuild
deleted file mode 100644
index b69eea0e499e..000000000000
--- a/dev-ruby/facter/facter-3.14.19.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake eutils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="
-	>=dev-cpp/cpp-hocon-0.2.1:=
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	dev-libs/boost:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-DEPEND="${RDEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
-	# be explicit about the version of rspec we test with
-	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
-)
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index 264e13eedbfc..5713d4a40318 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,4 +1,5 @@
 DIST regexp_property_values-1.0.0.tar.gz 12884 BLAKE2B 82f63d21a1e1508cef79afc2f1b5cca842c1e5bc96b197efa90ec0d02e7bd213cc67ae99f4f71cae6e632e0804fa2d6e935c7d30f27a940c767f5a83dd9edd21 SHA512 f51946d93c255c3b51bfb8055d2c0548c9656db9f208de74b569df8799fa97712a76b509546e149f71e3176ae0e979f295b225c171cedc687e1871f204c1e0d3
-EBUILD regexp_property_values-1.0.0-r1.ebuild 1136 BLAKE2B 03a34553868bb5f462fc72b9f50f430dd3ddd515dbee14b55ea118a813300253bac0b4064488ea89d8d7c67414aa5c0e8fe0b737e84b974d491b5cbb31bdd654 SHA512 6e849fd18abc2cb8b2e1a792bac4c3a995345e34cb8c509be9dde08257491c25869dd2efb5ace9d2ba984c45d55c594074533598a57c834c44ed8b2b13615924
-EBUILD regexp_property_values-1.0.0.ebuild 1289 BLAKE2B ec4065e1c453911d25b680eb2160b4b9849f2a953dd6da79edba54be2ec5a1999d70235a0d89eb7575f54426d97b6091f5b02765f1570ae2cf54d583d397530a SHA512 7986377a69e583eaa00d914e590d58e6d718dc3b016260e0e0220e5fe82e20be208aebdea8a665f008888e0eaf87a2c3ca2472ebc0974bd0e046747bcd6e51bc
+DIST regexp_property_values-1.1.0.tar.gz 13637 BLAKE2B c274dbe0a1168af8de4f3180ba48d3332b1b4425aefa7be33074465120568aca4fc3c3ffe5caa27042139495d1d6ce80e660da4239be8455f41f7e0a97f8f357 SHA512 196b29de3d41502b1f26fb3a64ecf6135ca917b85edb633bee015fde1dfac86e00f9565509973f64842a24542740cb4a887a754b4688f47fc32b0650fc80feca
+EBUILD regexp_property_values-1.0.0-r1.ebuild 1135 BLAKE2B b1eac8f60e2abc5b555e0a9061577a9087c0ba16477bd134c075e3aa875e63841e9063bd190a7ae5faccbd96a44bec6f643445ae29b8a765f53bfcfdfd147837 SHA512 ef06d5446b29e678a68beee6f4ce69bdc497f946802467334e6329631883ce3d274574947ac347e78cf4b5b3cf97ce42c56902e76bbe852aef6b3c72f7809325
+EBUILD regexp_property_values-1.1.0.ebuild 1138 BLAKE2B 7ca7c019d5d2e3b7a8e45d8e153b8a1fa51493a29fe334c7f1191cd633d01319915e0909d2d35a98bd84c82d6e4527cac6bcd795ffaabfe3895bc8ae0c7afd5a SHA512 0be1d93eed15c6ccbb706e7ce761abdc2a795ed6e449d0c70900099e6727e2bdb2e7ffe640f9aac2d12065fa9e1470da500566583db2a011fb2d7eee2401684c
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0-r1.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0-r1.ebuild
index c990f487d2b4..729c8b154a9b 100644
--- a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0-r1.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.0.0-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.1.0.ebuild
similarity index 64%
rename from dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
rename to dev-ruby/regexp_property_values/regexp_property_values-1.1.0.ebuild
index 0b70f9fd51a3..e3d040fdc586 100644
--- a/dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.1.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -13,6 +12,9 @@ RUBY_FAKEGEM_BINWRAP=""
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
+RUBY_FAKEGEM_EXTENSIONS=(ext/regexp_property_values/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/regexp_property_values"
+
 inherit ruby-fakegem
 
 DESCRIPTION="See which property values are supported by the regular expression engine"
@@ -21,23 +23,14 @@ SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
 
 	# Avoid dependency on character_set which would lead to circular
 	# dependencies.
 	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/value_spec.rb || die
 }
-
-each_ruby_configure() {
-	${RUBY} -Cext/regexp_property_values extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/regexp_property_values V=1
-	cp ext/regexp_property_values/regexp_property_values.so lib/regexp_property_values/ || die
-}
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index f62999ad508a..a7f97fb3cd15 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -2,8 +2,10 @@ DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dd
 DIST rr-3.0.6.tar.gz 139275 BLAKE2B 5388312320958a03cdd48363470e32911d46080d38e02e29891a9a0bcd2ebe18e0c6dcfb5188631cb607452ad66d708e6fc36b9ed1571031eb433949e4546cf6 SHA512 f80baee790efa5b43c280cb70ed4d1d9202e1d1c3ce653680e4b433d595278b4180dd681c30df75a78466ac687851f3e15d0a08110def1868ce724d07e025abb
 DIST rr-3.0.7.tar.gz 139473 BLAKE2B cf12f792cc851aea2a0281ac0a46a1fef5d8df616fc47b630f509336208b2b443e3cfddaf9329b105b2a121b6aca002c407d7123c9b0e9606bc0d5f1f08b01be SHA512 54b5393d5618310dedf68946a3d3387d738f0f78e03fdd2ec1491f5e7d8f0d4288599930bc3b7dc01b57399afd9cb094d9f11f5371cb5128aad74fe761445731
 DIST rr-3.0.8.tar.gz 140003 BLAKE2B 7bb039803556f30f487a129b92e737e9d70cf73c423cfecfc653ee3793e3fb1f576c11dcdade9ad4f15853ae1ad8c2a60535de47ade9617e37c0ca849ff06c26 SHA512 c1d156b7f663a09d39b064f80d9c59a3256fff3236ca48667ebee7eb3d846b8fda7fc042dfd7da01d9bed8dcc677ea5fea315d6be45f219a8f3719972ef01f5d
+DIST rr-3.0.9.tar.gz 140053 BLAKE2B 598a8981d9d5cc84a4a93e401a39596be3d0b81c28677ccc69dc9bffda618cc68b1fa3f723d725812305de8d58f73540fb1b12a388f2cf452f8e9ccd6649de1b SHA512 df285aa1c9c226765f33338ad267abfded568bfc2b76d7d966e20b68d849f071c2a3e3a6a666c70584993d26956a7ae0ccca8be68a66a862826c9203b0e04ee9
 EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
 EBUILD rr-3.0.6.ebuild 817 BLAKE2B 4ec1248283c2d625e69dada4114495b3464d6637f488fa8ec25bdf5445da754708445f49f1cf5a1c54a5692b8053907b5128b9f29ab29304c2cee3e1f9a661c3 SHA512 830afc03abb424465f89988b4d2dac384800c74e221f1542f49915d656e5304e21798a77fe3894ba040c95b0cb43c9c946d6220368d857821cb5d60fda542b7e
 EBUILD rr-3.0.7.ebuild 824 BLAKE2B f1cefbaec278f17d0c01075fa4fad95bab9df683ed3a2687a5186dbe9ef4652a74907ef9c619d5a11db64b8989ff6e3728746b60dc56fb46c73e971784bb031b SHA512 3c42e6c23776ee23c51168c3ab97a77e095b5031d253621ea1f616903ffb3241d7dc3be690ca423940fb53767989b3ac667d24dc47036fe58ab287b76685d827
 EBUILD rr-3.0.8.ebuild 824 BLAKE2B f1cefbaec278f17d0c01075fa4fad95bab9df683ed3a2687a5186dbe9ef4652a74907ef9c619d5a11db64b8989ff6e3728746b60dc56fb46c73e971784bb031b SHA512 3c42e6c23776ee23c51168c3ab97a77e095b5031d253621ea1f616903ffb3241d7dc3be690ca423940fb53767989b3ac667d24dc47036fe58ab287b76685d827
+EBUILD rr-3.0.9.ebuild 824 BLAKE2B f1cefbaec278f17d0c01075fa4fad95bab9df683ed3a2687a5186dbe9ef4652a74907ef9c619d5a11db64b8989ff6e3728746b60dc56fb46c73e971784bb031b SHA512 3c42e6c23776ee23c51168c3ab97a77e095b5031d253621ea1f616903ffb3241d7dc3be690ca423940fb53767989b3ac667d24dc47036fe58ab287b76685d827
 MISC metadata.xml 332 BLAKE2B bd48ab9bc20270067f37efd109aca31b1ab136d04f3ee8d3f63ba1f88e85736991d2c584a4143a0d6d0ea1ca198b5b2d040556d48f5884f90f8fe0821a82cbbe SHA512 381259b905f2509b530d2474a09accc4c52e4e45adf96f23115756b2be71a1c9c2e36d4eb239dc4c333d5e1d6e7adaff575f4c1fba96a00d6242867235552177
diff --git a/dev-ruby/rr/rr-3.0.9.ebuild b/dev-ruby/rr/rr-3.0.9.ebuild
new file mode 100644
index 000000000000..0ebc522df87e
--- /dev/null
+++ b/dev-ruby/rr/rr-3.0.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr"
+SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~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"
+IUSE=""
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest
+		dev-ruby/diff-lcs
+		dev-ruby/test-unit-rr )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 19030ce442d4..b11582dd97e1 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,15 +1,9 @@
 DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
-DIST ruby_parser-3.15.0.gem 527360 BLAKE2B c27b98052c0850df8decf123a471fbe541190b611b6abc803bd868749ab2c020d15935264d607ee617b8e75df44871b2985bd11bf17062051a172df935fedcd9 SHA512 f4d64a7f86d94a324b47f9354b8962a5b96d62ac41b6fedae602b0c3782bf2871ec3d0131770d886c5f58de188a7ed71fa3c31c548f53b75ff04474962b442ee
-DIST ruby_parser-3.15.1.gem 527360 BLAKE2B bb8c486f5c1e5da82aa6f0c2e0c08a8fa21928cb6fe1468f68d93cf79159848ae9f88f9eaa446d4d2a41b3f49e2cc961048f3bd6341da639aac99755095f5b8c SHA512 221af19b0b3d035af1b57a098076989f93f8237da3a0833aa2dbc85d5840b343215a2e1421d4685f9cb49f1d85af8640623ce387fd5a22af440432f0699097a8
-DIST ruby_parser-3.16.0.gem 584704 BLAKE2B 87b9308beb4434565b4238bc3e0faaff4c19fbb9531b534121e1e707a9c890be3450137a4190e819ac3cd77241abdbf4db04f4378c2f1f682d31b7bc6325c26d SHA512 224c316097f11fc37e46d20edbfaa4f1bb29a7fc0ef5c86e6852d1df42673b50762941ca4f6a3386047e24fadeaaa8041f0322934b6df5a9e651fde5e3cc3703
 DIST ruby_parser-3.17.0.gem 586752 BLAKE2B 4d3b7d2105e7c4529eb69e4459f73255907ff17cd7008f5282a92598b014dc4a107e723e44d91e907e1fbac17ae2495aed3daaa8e2473d6dc20d042d6a3ae83b SHA512 6786f58aa4007b407e04669554add6d2fac2260c1ad12db78a4b7816799b7b30d163a554d93d4fa7f043a8e45dd11316854e9f42d63bbd5a542cd2f950c05278
 DIST ruby_parser-3.18.0.gem 634880 BLAKE2B dce4a90d4b80a5d2d77e7d52ae7ecb2b0a4b98bf0d7ab1e47bed4b2d4e2c2d30ff6d379dbc50192683a82326d4f6b6e63a7d51bd1d9a498b0abc90daf18adbf0 SHA512 e34b42770a44a32f91ef29d7575db26b2fd24188b4e80fda1cc69d99469a454699ff76c715a9acd0342709989140bd5783b629996f89c1a58a422dd971a1271f
 DIST ruby_parser-3.18.1.gem 634880 BLAKE2B 046ca70510a62e515873039c3846c6dfe7eda204b10c28d1a2892052ee9662be46c99e8f3474577e1e513bee395a404e05d2bcc133d293ae04e2b8b0accdf95b SHA512 820b7dd75f92daef364db9b691ac7c71e460ad0f7f20491036c659310fd08561ae83f227bb5d82748d3b4a40fbb745c57144d8503a395a30eaba934df47f33bc
 EBUILD ruby_parser-3.14.2.ebuild 1067 BLAKE2B 75ab55434aef8bf6d53b49948b9050b7cd43f9b1b2f6ec816f28937d17fcdc40742e153b020b03120847f5d6359f251fd9f51ece19ff1f8c6ee7fa75826aeb6e SHA512 f8a847213cc83752ed30bfddccb4d709ce9444591d787901921279a198b4b5c57afbde22527027cb51ac2a13a5c5b50d1731ede3991672b791476aed8636a281
-EBUILD ruby_parser-3.15.0.ebuild 1062 BLAKE2B 3257dc721852aa236a7150fe9e89d7bc00cfad1fc0f5085c79fb47bf6e014440f831505b58786187014b40398d12bb4aa8a63ddb643213986e8a9c75093e95e2 SHA512 98b0f594469af0fa26676ec2db600cbeabc8f7192ea0521351dc22bf27e753558740fe4781e303afc40a96941d641a5bfe17a09e6a2ed2482a9016ee27d16149
-EBUILD ruby_parser-3.15.1.ebuild 1069 BLAKE2B 3ee4919e24ac1fb28865fe6c3d306a9396a9e12c2968034102fba2b2f757c5789cd3a2c67547d6fc214f70a7d8583e07728f92f13fe1710071a07149ae313f0a SHA512 da9f9c9fe8d88ea339757011e3597c13f94fbe4aa4ed30370e6b5891925ac62732ad7e95174de12c11501d547972d29c66cae9c2e0996240338a1c01c68b7b8d
-EBUILD ruby_parser-3.16.0.ebuild 1070 BLAKE2B bfd247a8ea17c5f62a66160b8b88d65496076ae74acca68be18e7b20c710394c44952331bb7ba9d068ef116671cf47ee2f43bec81a2f70b1d5078705a1d0afc4 SHA512 35d466825f7c3c902363dceebc55a8c6eab72a8dd9cf00375af448875d445b2af8d0f9e1e6ad9789efadd4b4b8576260b4fa4572af03012f2357f78bd7e364fa
 EBUILD ruby_parser-3.17.0.ebuild 1063 BLAKE2B d16162910ec89410527e8b57f233557b48fd3e4d4d7a9ccb40f424733e12e69e8670123b9ed2123c6a4543ae7776c83cf2684f4142e0b7df27de7811065ddf32 SHA512 88bbaa9cadbd0862514b52c7fe388c12c0ac5d0def695e2bf11022b73e1f8fe48393008356fa26b6f3e09600c990306e4c62718f27f077be6992daefb446e2e4
 EBUILD ruby_parser-3.18.0.ebuild 1063 BLAKE2B c3bcae29d60fa84ab52805326a8eb9e5d5a96f2baf31d2d8e55b6b854aedfeb0dbea3c8a4f7fe84777d9e24d3992ae74dd55d4aa9356265d5fd0f199c65a9d3c SHA512 00a2975bdd4216ef714c4b7d1b9cb090dd4ef7dcddb6ef762d0037abae75a0dcd790bf6ae2de989178409f1cc965907342d9934f1b2715df3aba9c81a7e96a2c
-EBUILD ruby_parser-3.18.1.ebuild 1063 BLAKE2B c3bcae29d60fa84ab52805326a8eb9e5d5a96f2baf31d2d8e55b6b854aedfeb0dbea3c8a4f7fe84777d9e24d3992ae74dd55d4aa9356265d5fd0f199c65a9d3c SHA512 00a2975bdd4216ef714c4b7d1b9cb090dd4ef7dcddb6ef762d0037abae75a0dcd790bf6ae2de989178409f1cc965907342d9934f1b2715df3aba9c81a7e96a2c
+EBUILD ruby_parser-3.18.1.ebuild 1061 BLAKE2B efe144589f1aab56609601e20777d3436ffe9dfe5e574c5b1633960889337ee5776aca705b45e768649fd48d30306883d1b51394ec7d8382e27664296abc3ec2 SHA512 1b42a3a4ad45cdad9c6ddd8648b794dea7f28f3728b88b00253a99cb0f1b604d66d0447578b3f0c34e3459176448f4299b17288e4e937b16bb27fa6887c595bd
 MISC metadata.xml 348 BLAKE2B 10262df68f010eaed20fa390ed4feff5d619e168319f6477d9d70ef15a91219af5b4f49f89316c0350f3cedee9a47eb46a67c9837d22ce58ac190c55a747ac21 SHA512 66eb4ff6e49c3249c2a952b39d3738f3c66252203b16cd635aa04d59eed907cfe9c11197a4e104fd8cf0585b9f3d60c639e4ffbe7ddabb211266f60a9e348bdb
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild
deleted file mode 100644
index c4f4e0bedb22..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.15.1:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.15.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.15.1.ebuild
deleted file mode 100644
index 48b33d077855..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.15.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.15.1:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild
deleted file mode 100644
index 95016b97fe05..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.15.1:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.15.1:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
index 8c3041fafc92..73a5e7da7259 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index a49fbea2b86a..10a3727f5424 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,11 +1,7 @@
 DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
-DIST sexp_processor-4.15.1.gem 56320 BLAKE2B 1f75dd7dbe39b3684ffcbfb607c961e9406ec16373ad24ccdf37d4bd8369a240b8fdfc16f6e7437dda06605c26b2f4b507a14bcf680b91e12bd7827539f54e53 SHA512 e2ae9f5e8f61c1a703f14c692cd171ceb9acda5839417589051ffcb818584ff65a6a86279f3d6f2b9ad8c97ce842d946b57be810e5887effd4c606b6fdf1d984
-DIST sexp_processor-4.15.2.gem 56320 BLAKE2B 673b10f1f9e5e4a0784a00e507a47046235cc00c8815292ed57abf0d6d11f0af2d559eadb85aaf28d060bd5b2917ee08b42c48ef4a3ed10e21b8af06ab989177 SHA512 6eecdb247ad3e0d78c666d98c7515824d22a38bbeb191c8ea783b53fa7cbd71483dee670f65ce8abc11a176ddc9db19d80ba71ebe1b6cb8120a07ce3af6d0df2
 DIST sexp_processor-4.15.3.gem 56320 BLAKE2B 4274415a3f4d22575e5b7eebde0c0126099d4b53f5b63c14463548af6e6d227926a0328feb2ed49cb448f5938c09dad71b8ec815c5e215b6c7a69fc0f6b6281d SHA512 dc8f2d7f307b94cd781fe54192a93bd599c55d91aeae84334358651afda9405f05d3a4a52d7712ce9f7214f8526019d7a4c085a98e7dda10c5680396b586c97a
 DIST sexp_processor-4.16.0.gem 56832 BLAKE2B 431005f5adc04605f6be5a34eb8933b32e4c90426f7099c670f70753381fc8892f9f9b39cba715e6192cd26a9a042ca4d7122ef7e75d2310d72772c3ba470fd2 SHA512 d6300b963782fcaa1f0854a0a10714e9fd65aac2925ba99e9c986eb62f2e940c18652f919640bcb9f8bb13ea613bee723f80a3237bd6a692bf719e726dc917f3
 EBUILD sexp_processor-4.15.0.ebuild 741 BLAKE2B ec8d3e01c498991cf2b2f3c40d5563df1604382daf0005ebeb627ab909a47f23f61a32c31a4e4c1dfa29e492d82044dbe99a3189ce3c43a81c4c1fb337e34ddf SHA512 e5278d94c67cf8a6c8a8188ca423076492abf59c0629d9bbccb85a6662924f800877f88ae85bf4027e96f22adbc9bd818880a0159355bcd45da99d8ee60202f3
-EBUILD sexp_processor-4.15.1.ebuild 743 BLAKE2B cb9fe8637c72871ddc0ec565ffbbb141c9418024335b2fc3ee2f7a67fff395e618c4583033973b986af796063c09b90309acc0e0805ea662e90be18ed1fc6314 SHA512 66d650a6d3be101fb1b5523c0d65b3484bc3388a9a968cfb9c287d6f0e55ef2a006df93c1ccfcbf76f94c996963ee92e43d121049a218eab503b1c790626e57d
-EBUILD sexp_processor-4.15.2.ebuild 750 BLAKE2B a01f7e29c28decb5e4513b8ce0a0e2fc7112d3cd4e58595c0e70c0a8fbda675cd18065d7d156e9a7013ccf3ab1fd716529cfedb3f0d40cdda939e3e7bf466b4d SHA512 2121a359ba4d400616459e53712de388ac89d93ece207167efe1616d657ea70a3dc92c6b785f144313b880388bb68856bb94273ff99538da2a3a6a7a3a463df7
 EBUILD sexp_processor-4.15.3.ebuild 750 BLAKE2B a01f7e29c28decb5e4513b8ce0a0e2fc7112d3cd4e58595c0e70c0a8fbda675cd18065d7d156e9a7013ccf3ab1fd716529cfedb3f0d40cdda939e3e7bf466b4d SHA512 2121a359ba4d400616459e53712de388ac89d93ece207167efe1616d657ea70a3dc92c6b785f144313b880388bb68856bb94273ff99538da2a3a6a7a3a463df7
-EBUILD sexp_processor-4.16.0.ebuild 743 BLAKE2B 8e12e9791705b503d581f9259bd3eca1063fc2a1d6161773f74dcd50d5e3a63a17f678225f60d3b186a7380b0c97b8d767504713191a7c8e27cba375ee3777ea SHA512 bc8706d39c7f0d81d7dfe9743a6f987278ca17fdea4931572f3d6b1f955df87ed87cf2075f0ddb1e99d82b40b3fa38f171e74e0441547e3913031487435b29ad
+EBUILD sexp_processor-4.16.0.ebuild 741 BLAKE2B 1b6d8821716a7e702b9264f3c8e7207036e579537619c3f084cddeabf3f5eff1ea30c6f80099d1b1df3256197e2953212f7455697cc1323d055eac5d63b49b41 SHA512 be8d3c9e2eb9285d5ef26b713e0b22fc755532c6cf9765eebb25b79ed25bb1b35ff399e311b2161b32d2e66cc5a6d889f3b866c9396fef0f4f93d9af39f6953c
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
deleted file mode 100644
index c51e7b761f5e..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
+++ /dev/null
@@ -1,28 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.2.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.2.ebuild
deleted file mode 100644
index 34e019ecd2fc..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.2.ebuild
+++ /dev/null
@@ -1,28 +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 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
index 84dc8e1d09f6..bafed2991b92 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 564656878bc0..8023b7026b6d 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/latex2html/Manifest b/dev-tex/latex2html/Manifest
index 7cc6cec53229..c26047bfb070 100644
--- a/dev-tex/latex2html/Manifest
+++ b/dev-tex/latex2html/Manifest
@@ -3,7 +3,7 @@ AUX latex2html-2021.2-respect-DESTDIR.patch 759 BLAKE2B e44fa0a31c248a55a1da9d26
 AUX latex2html-destdir.patch 703 BLAKE2B 47693763782d056eef223856a679112fe0989379e589f0b9d891f7dcd6b2b316de7a5d631c0b089709122d844f08ae268cb496055726abcee01ffece268640e8 SHA512 dbc4e9272ed54949fa34da8fd4b0e15db646461ef564e65d7b4a20dd89425227b93987a2a214ec57984b200135085b6456d758efd2faffd89c16d305d315d744
 DIST latex2html-2021.2.tar.gz 1139791 BLAKE2B 4fa9b45a33dbfb5c9e3bb45ebab19edb5d7a1d9c882ab30e75afbda7ad902cf519403b685f1f30b69b3d6ec976aa72b3065851b6d24b00c2e626e496ea8afd79 SHA512 b8d742b427e833f732457194cc60c043f750d202c46fb0d1d4e46df8e6d4dabacb5b474084aec46aa4eed68ee0249f3c0b053b5446401d09034e7f59148ad18a
 DIST latex2html-2021.tar.gz 1130224 BLAKE2B c3775b2546a866834c0ed94362a428f2cfe48e8fe7337261993fe1f473350ddb778c50cc4393fe33c9f3829e5dc6f5c0ef43ae6a4c21481746023ef5939308da SHA512 f1f087a58911410b3ca9f4b60149b66d17608a9a56d0e8f74f08e6d6595e3e9c4f5378a7ab5cfc7488cd182a0dc3d4c151283b57636a70271c7f734e69ed0608
-EBUILD latex2html-2021.2-r2.ebuild 2089 BLAKE2B 32861d2147dcea6679452edb63304cce06201ef450f05d4581d1756dfaa8078b3df2cf870a699c97707b9901975db39f2fef22fde420f46e30b33a2d3c9920fb SHA512 8d4c5b9b65d3952237d74b6e2948eb4a045bc44c1edf1f177924e46fdef9ce179910977258a133737f552a6c74dce429e34546b861b035cbe0f7e5cacdea7f2a
+EBUILD latex2html-2021.2-r2.ebuild 2088 BLAKE2B dcd62d665cfc367237222e9f42f724b2183b65c84d01639ebe7b1d68d3f5b1857175287c09c2153dcb388d7976ca9bffc55a225d939d3f1c12e35fb9047b2ce7 SHA512 e47cce87c0fb2cb5eac24b50541296b9fbaf2c2373bd7402788eaef4b4294a83c927e546f0e8f4f29d1c189ddf420731ebb8cab3f51bd103d03d2921c1c18002
 EBUILD latex2html-2021.2.ebuild 2028 BLAKE2B 9aa1e238f2e40d53f09f8091e10a6e6957f52a9f54e9f3c6139f96fefe44bda754800da8b155f2e2afa6090869ff28ea2e806d73bc345197fb426bd2e116d184 SHA512 874fa5347f8b4358d8fb41e7b7360fe6b5919389e8a6b10bed06fbf4db6f1e876edd4275a3db610d85c73fbac0a6dbbbb96d0d3c66332f677fa76cfc7131fb5f
 EBUILD latex2html-2021.ebuild 2018 BLAKE2B ab991b45083b57b126b6a02ee68c6ff631466e223502b9135e0e55abf87eed4772ecdb5686b0184e46629c30e96e0bf374b520d159b98c91fa0b7fc4b6f444a2 SHA512 396be78bd9ff43572f806cd2cd3f0ae7ab6eeca3eb4c1513c8ff35c480f5701a2733ef6f4a80cd0b506c845f45e3fe575cf53196469d42ec9de9b6f6b0b43e0d
 MISC metadata.xml 343 BLAKE2B 558686c939b58e821fcda11117e4f65bfc6965642528ec3cf7b4e86ade37730ee8aa2ef00902893ad82c47eaeefdf5a30d96f760e21a99bc701cd1c4e83c1e15 SHA512 fb0a0f1b8f96781f5e188f9d6f1662597f3b2c3a81d1130b35790bbb5358afcf6ee7f71832ba97265220e760bca98d4c3395c1e24b7354170d22ae1f46970330
diff --git a/dev-tex/latex2html/latex2html-2021.2-r2.ebuild b/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
index e5ea3b8318d0..10a9ff6eebaa 100644
--- a/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
+++ b/dev-tex/latex2html/latex2html-2021.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/latex2html/latex2html/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="gif png"
 
 DEPEND="
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b39ec22b3667..03124c8e008d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 2289166f467c..4a50353a4912 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -15,6 +15,6 @@ EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee422
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
 EBUILD codeblocks-20.03-r2.ebuild 1855 BLAKE2B d6c4104baa3bacde4ec517e18dc168d75c2a023b087e1496727501aa3bcecdb23f9e9168dff7a0f0662a32a58418454c5b836d24c80d6ae85713a557ca35d46c SHA512 da341a5f98a4d92016acb6ad996e894044926c2ec1eb77fd535b9463f823f99c3952798a0c8b4c59479efba4676fb51eeb364f76f02a31f54658355fa83eff6e
 EBUILD codeblocks-20.03-r3.ebuild 1819 BLAKE2B ac5eacadd466c160cc2fcbd82b8e95c1bbafd0f7b10477202506cc0e92b6e70fa4fa2028968ed6f05cc906c89c594d6c0bf98e49df6b9dd3a0e11c47c62ca609 SHA512 01e91fd11037868e1e60198f1979248099b02c16a58eb624dc09bf8ab4f3bf443a16aa9b4d96baf75b05964fb8b00ecdce5f6813de7b81a2b42067aae0cb0baf
-EBUILD codeblocks-20.03-r4.ebuild 1888 BLAKE2B 0c20473aedd8143ae5259e13f1ecffd9ef6675e3d2338ff4c26060092ec814f8978080fbaeb3b1da2559d738d3a89b5d5c880b6df15fe6b33f881c62bb4b5b79 SHA512 94ec1ef815f1243888c7c606b51c911e7836c59c75f874daf5ddd9a196e8b55c0092d0d02f8e40b5a87f2eeffcda4dff2d8abe3fe715bd58af318be17e85b3e4
+EBUILD codeblocks-20.03-r4.ebuild 1886 BLAKE2B 494dabba78cc8fa158cf70f111c869ffd95eeccfb1b6d67948efea2a9b6709d19bbfe71d124220c34dc8de4e4c8768a03cd0bdef84cd4f80609c91eb27c87432 SHA512 e0497e4a4e9ac983035936a385e399f97afbf47a70275577977bbf643c98e5e9b5867c50e9a6515d4d7138a3b9188c0aa069f79b95ab1ab9069fb361e1ee069d
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
 MISC metadata.xml 845 BLAKE2B f7b882b01dd425c6eb56c164a95e7e635ba59591ec1839a9b925496e4c40bf03497ec4134eb38b47f9eb54b765773890896ba243b5936cf7bc3b71f7e7ce41d4 SHA512 ae0650c5218f8e18422926bb11daa9cc89804221b9958963da484464668e99f6049ef099fc6a63f3a0800fa15238ecf0607da0a495c42d5029a94ed15ef4c985
diff --git a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
index 2a412fb830c1..a4c49bac1afe 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index ffdcf64860db..ebc56ac12baa 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,4 +1,4 @@
 DIST cppunit-1.15.1.tar.gz 814363 BLAKE2B a1d1d1ee9b6ef408843a6e989a37653944ad85069b4896f18d0f01410acebf7342f70e8c031e58f7ad0e686a85869d521906816e0f0b1762d238efb606cb7310 SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
 EBUILD cppunit-1.15.1-r2.ebuild 1659 BLAKE2B 267535123db135043b5a74bae59ccee1428625ca3040527fd607f97e709350d8f58f947cef55b9604a9e47a312df2cafa8e903b6a6915db261995cda4f9dbeb6 SHA512 662b8bd560d7040ae6a0752be6cdbbc6849ab116498baed1d913217e232dc4197f8d28117835b06c687716a5c142d3b4a8cfcff1759156648c0621e8752bb70d
-EBUILD cppunit-1.15.1-r3.ebuild 1344 BLAKE2B 4daf858564f10237674dbbc398e265d1e56ff7deafd975042a2cc6c0e442001faab3a458d8c3592c29974924be91cf8d201787d9eb730b680b5d957882927859 SHA512 58d972ffcb78fab95e00ea65112067387cc6b4023d492b42a77331a500477c4dd5c363399eac0b8c77c95effff9a36611f078b15ebfb7c64c1bf459c29219280
+EBUILD cppunit-1.15.1-r3.ebuild 1342 BLAKE2B bd163b16923d4930afd9530dfc31c67ae40e4783cc5465720711d54b01bc4148096625bd1bcbfbe16a6d184233be0ed9e0915f5a976e6e9b19d847a3b5006cfc SHA512 9ca5e1a541ad5168de69012fc212e6434bc3b156dcb46ae3f630e6f1a5fe58dc1c1c4b0c264d15103dc4a9ba206a009b70197a512a84b42bd12a5792d3e0dfb4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/cppunit/cppunit-1.15.1-r3.ebuild b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
index 8d67dbfe9514..d539c20b4722 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
 
 SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 LICENSE="LGPL-2.1"
 SLOT="0/1.15"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 7cab5f6c430b..72771c98c930 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c
 DIST diffoscope-194.tar.gz 2704634 BLAKE2B ca080f07ab23d48cd772302f47fff67c38ca3106d2fd96de37b9112aa316ec095acb07062316abf60ac3457de99b6e3f69adef166ab4b24943dff9e8a127f99f SHA512 cfdd30ea12326ca08f200a78fd77b5b681bbe31cd292fa22fcab294a64717a06f431bcc8c3def7c75f9fb554108e48b8043bc3901d5e57a2be3cc38d20a303e5
+DIST diffoscope-195.tar.gz 2704638 BLAKE2B 7d8caeaaf5d844c85254f017e49544e016ea16c4876623c0eae18c78389195f91ba567c1197ea9d1ccf326a92483be11a189afdd96a334fa8e0f766a7e78fafd SHA512 619517ce1900ba5e3e642ca758767aacf8bb3b58e288710cdb425500e6074135a5d2147a34214b284b94eacb781e790f638c57e1489492eae8c4bd557fce8a4e
 EBUILD diffoscope-190.ebuild 3291 BLAKE2B bc2d73c19425cb02d4594514f9ae8c53e5bf5304360cd82b9bfc338ce914d81e41f6bde68b2aa9c3137a0de1dbb6c15a0992d2808bd97b5a28189d8818bab362 SHA512 bb63244ba0a19fe88ded3a684bf3cf78f7b6519c6708f073b7d1fec1f12373beffd7398066f6f95978dfd25783e1e87fff49dab97202bbd4beef10be7568859e
 EBUILD diffoscope-194.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1
+EBUILD diffoscope-195.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-195.ebuild b/dev-util/diffoscope/diffoscope-195.ebuild
new file mode 100644
index 000000000000..bd59e85cceb9
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-195.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="test? (
+		app-text/docx2txt
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+		# img2txt based failures, bug #797688
+		tests/comparators/test_ico_image.py::test_diff
+		tests/comparators/test_ico_image.py::test_diff_meta
+		tests/comparators/test_ico_image.py::test_diff_meta2
+		tests/comparators/test_ico_image.py::test_has_visuals
+		tests/comparators/test_jpeg_image.py::test_diff
+		tests/comparators/test_jpeg_image.py::test_compare_non_existing
+		tests/comparators/test_jpeg_image.py::test_diff_meta
+		tests/comparators/test_jpeg_image.py::test_has_visuals
+
+		# docx2txt based falures, bug #797688
+		tests/comparators/test_docx.py::test_diff
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 6128d65b9b42..ed3c0ec0d18b 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -42,6 +42,7 @@ DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a2
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST git-delta-0.10.2.tar.gz 1157178 BLAKE2B 768a3320f238de483abf1b4d5360e368edd85c0e0e7367059ec787decfb16886471d66e38723d715a4de3c360063bae113b781cf40f7eaa8c1bfb300c4f251cb SHA512 9cc5d69d9ccfdd49a35646fd23aec0f12369c6f0342b3c77e98eac28120418d8e8e4b7652a869d82bf0a2fcbc110951aff99325288b9eaeff4b97746a065b548
 DIST git-delta-0.10.3.tar.gz 1163639 BLAKE2B ef902e86bca4d496a75e49e0acd0791c08dbd0f6c196b7a362c6e3e9767ebf7fafb010d33c6513899618532c93af8bebe76918d64361b3c710165555b7320e25 SHA512 5383db953728e08e463e93a4da8750089ff6f7aac4df9fd564b81fd002844739834c826459702e4ec019359e696f47e6bddce85fa7bf02fc104f8a7359a3632b
+DIST git-delta-0.11.1.tar.gz 1194323 BLAKE2B 97abc0044476625c1967071e5d5812eb1f7ecc3b1ec4a779c4c1ddeb0c157ebccade35446a1436a6842d72899f23ee51ff186852923bc0127f6618921673c649 SHA512 fdcecd155335122db6a1171817687e2f07aadbc5b52ff50eb064dc2b6cc921b2635efe27d52e8786935a3f6abf9429247ffb438cce8364fd928e8277cb89fb39
 DIST git-delta-0.8.3.tar.gz 1069452 BLAKE2B a27fe07538acfd6346bc12f2e4ad03396737e268ce4653b25c908fbcc7bb47fe2ed76550dc431ab80bf9ab86746d4cd9b551ea68a47e603ae9fe99aa935df7bf SHA512 8cda4255c878be8dc4dc841dc1778f992c7b01c7a56965babfff9cd0dd085b751e79ffb87450d50d78fd094f2ab851f468c0e88ca4e2f0becf6ebbc122ce602d
 DIST git-delta-0.9.2.tar.gz 1126468 BLAKE2B 46ed5598965553f6c9df28863efd0304deecedc41970701fe46d8698494cdfd371bc463845586b9e3a1150034a36abde403d6eb5185c79bf65d918418690beea SHA512 14557103e0a5edf1c307c5036dc092fbab119952d2eef95709e3a363d913ae11e3d8fb7bf16e7dd26bd36e8a7d51c49e70edb002fce8f00b428c7ee330d49d01
 DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
@@ -158,6 +159,7 @@ DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d759355
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD git-delta-0.10.2.ebuild 3651 BLAKE2B 65f66a5413e13286e7b96f21e967c468bb3b68900a970371bbcf875d4522e31543ebafde45b143e5a56e884b0923a26b60fa8c6d1195ac32c275aad4d184e378 SHA512 8fe575771704c620b72e84f2e3581de9e89ac1762d5567d067a148edd672f203adb3f6e0b83f518a7919ec1b134fc8011bb44120555abdbac62e187ac1e06d3a
 EBUILD git-delta-0.10.3.ebuild 3650 BLAKE2B f7115944d4350dee30adc583dd4ccf45f227b7aa462055946afecc7bb4248bcf00d105d627e3ae474749979b0c585774d8ab40e8568a5cca49f7b40e1fe8d6d3 SHA512 59e92872e1399aa6b9c1d134fda8320065cdadfdcee16ab988919a2c982e983dfd776f0745c7ecee0799f4fd8fd94ea5306762f94ee8695704f737f95f2ab62e
+EBUILD git-delta-0.11.1.ebuild 3650 BLAKE2B f7115944d4350dee30adc583dd4ccf45f227b7aa462055946afecc7bb4248bcf00d105d627e3ae474749979b0c585774d8ab40e8568a5cca49f7b40e1fe8d6d3 SHA512 59e92872e1399aa6b9c1d134fda8320065cdadfdcee16ab988919a2c982e983dfd776f0745c7ecee0799f4fd8fd94ea5306762f94ee8695704f737f95f2ab62e
 EBUILD git-delta-0.8.3.ebuild 2960 BLAKE2B 340cf1f7bf23175b0bae7bacb84a6bd89853807b15f484e922481bb080e360e2adc7abea5bdf2d34725c9d556761f73e51b8b3e98f42be367a120b6eb39648d1 SHA512 eec752b56f2f2c202d8f8c4a46509b0921e811d1b52b54fdbefa7e72a4783eaa9186f81fa065aaff665cc0bd3e5ebde637391f84be28bc507d373566cca829a5
 EBUILD git-delta-0.9.2.ebuild 3267 BLAKE2B 4901e4e31893d226fde729f5cdff902695a7b13d58d7c13b31992c18db28e4ae82f8ba97dbb5eb9ef3ac902c6ee09d61a5b141f1ee3c8684d5fd369e70001d3f SHA512 8fb549ec50c1b9f6707f61860602f2f37843d0ac34a85b928894d73b6d025d238b906aa49f5d04967fa212a75923984162626e8e7594e291faca23081deede65
 MISC metadata.xml 331 BLAKE2B 01b09c3e764fe24bd909a1e63b92e84a43a251f2487a0bddbe08f698eed443217a87f346e815e8f50948f3511e8036c8036d3c6e88195b6a6102e69fd169aee7 SHA512 cf4eb826415b89530fca726807669309f34cb2a04adc0b1a9352b10d9cec538beab5ebc79b1bbc5c69d9ae160856a5346cdca7315fd6be70de546e0abb89a020
diff --git a/dev-util/git-delta/git-delta-0.11.1.ebuild b/dev-util/git-delta/git-delta-0.11.1.ebuild
new file mode 100644
index 000000000000..508f89a40667
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.11.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-0.2.3
+	aho-corasick-0.7.15
+	ansi_colours-1.0.4
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	approx-0.5.0
+	arrayvec-0.5.2
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bincode-1.3.1
+	bitflags-1.3.2
+	box_drawing-0.1.2
+	bstr-0.2.15
+	bytelines-2.2.2
+	byteorder-1.3.4
+	cc-1.0.66
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chrono-humanize-0.2.1
+	clap-2.33.3
+	console-0.15.0
+	core-foundation-sys-0.8.3
+	crc32fast-1.2.1
+	ctrlc-3.2.1
+	dirs-3.0.2
+	dirs-next-2.0.0
+	dirs-sys-0.3.6
+	dirs-sys-next-0.1.1
+	doc-comment-0.3.3
+	either-1.6.1
+	encode_unicode-0.3.6
+	error-chain-0.12.4
+	find-crate-0.6.3
+	flate2-1.0.19
+	fnv-1.0.7
+	form_urlencoded-1.0.0
+	getrandom-0.1.16
+	getrandom-0.2.3
+	git2-0.13.23
+	globset-0.4.8
+	grep-cli-0.1.6
+	hashbrown-0.8.2
+	heck-0.3.2
+	hermit-abi-0.1.17
+	idna-0.2.0
+	indexmap-1.5.2
+	itertools-0.10.1
+	itoa-0.4.7
+	jobserver-0.1.21
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.103
+	libgit2-sys-0.12.24+1.3.0
+	libz-sys-1.1.2
+	line-wrap-0.1.1
+	linked-hash-map-0.5.3
+	log-0.4.11
+	matches-0.1.8
+	memchr-2.3.4
+	memoffset-0.6.4
+	miniz_oxide-0.4.3
+	nix-0.23.0
+	ntapi-0.3.6
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.8.0
+	onig-6.1.1
+	onig_sys-69.6.0
+	palette-0.6.0
+	palette_derive-0.6.0
+	pathdiff-0.2.1
+	percent-encoding-2.1.0
+	phf-0.9.0
+	phf_generator-0.9.1
+	phf_macros-0.9.0
+	phf_shared-0.9.0
+	pkg-config-0.3.19
+	plist-1.0.1
+	ppv-lite86-0.2.15
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.24
+	quote-1.0.8
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	redox_syscall-0.1.57
+	redox_syscall-0.2.10
+	redox_users-0.3.5
+	redox_users-0.4.0
+	regex-1.4.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.22
+	ryu-1.0.5
+	safemem-0.3.3
+	same-file-1.0.6
+	serde-1.0.118
+	serde_derive-1.0.118
+	serde_json-1.0.70
+	shell-words-1.0.0
+	siphasher-0.3.7
+	smol_str-0.1.21
+	strsim-0.8.0
+	structopt-0.3.25
+	structopt-derive-0.4.18
+	syn-1.0.57
+	syntect-4.6.0
+	sysinfo-0.19.2
+	termcolor-1.1.2
+	terminal_size-0.1.15
+	textwrap-0.11.0
+	time-0.1.44
+	tinyvec-1.1.0
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.16
+	unicode-segmentation-1.8.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.1
+	url-2.2.0
+	utf8parse-0.2.0
+	vcpkg-0.2.11
+	vec_map-0.8.2
+	version_check-0.9.2
+	vte-0.10.1
+	vte_generate_state_changes-0.1.1
+	walkdir-2.3.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xdg-2.4.0
+	xml-rs-0.8.3
+	yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/libgit2:=
+	dev-libs/oniguruma:=
+"
+RDEPEND="
+	${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="usr/bin/delta"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# No man page (yet?)
+
+	# Completions
+	newbashcomp "${S}/etc/completion/completion.bash" delta
+
+	insinto /usr/share/zsh/site-functions
+	newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 4e052c569b08..f2f44955dcdd 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,3 +1,5 @@
 DIST include-what-you-use-0.16.tar.gz 742573 BLAKE2B b8cd90db490d13f140126df8955d0968a9248480da09ca29b82fe1178c779ca75e6f29239bc6fb1556200c7d7c498f2340839e8500455ecaed9e6199fd3d55f7 SHA512 2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5
+DIST include-what-you-use-0.17.tar.gz 747385 BLAKE2B 0f584521b070eec6448d65d6dc4c4fe09110e85099d2696da82be800ee82522185f378c849559d899424a85864878d5b7b4790b900c438ef1f008262d6de6e28 SHA512 2439e3dd37163d3953fc1e45614fb4325be093a162f25d0f45fa8126b2313942a7c8d45ed12454dfbfeb4cb4fcf2f4e3eebdc0ec5da14dad23533f7a0bf58290
 EBUILD include-what-you-use-0.16.ebuild 1172 BLAKE2B 60808543d4b660f87bd498de00f3e80a71921c5e3ed0726bf3a7d0588be7240d66d2456d4f03f2b143ff20ae67e7d743262beaf17dc6efdd77e46936e9d01585 SHA512 118f9e92561d531c13ba576e1f27ec929fa6432c416be34a6fba6585b23ad5e0e812c134b9d8d90273a33b83b03266995dd5d6eb8be14bc75d4269ffaa2be548
+EBUILD include-what-you-use-0.17.ebuild 1173 BLAKE2B ad05a0d0e28fe780df5813a45200bca4c3a9b3ca70a4a3dfeb94c4cc5854aac3c5c3037fb84f19d9c22d07429c2ff58425e3caab195499d76281632c324addc1 SHA512 37d6e97256e0713a08177fab3e7d586a5ac79fe790f51488d1213e81af14647b36f70f4d4c5ca0dab309a12af6e3ef606747dc34e48da96d56f6e35742e1aefc
 MISC metadata.xml 353 BLAKE2B 2d95f026ce60294177b001cddd8904988aeddb3fb257a73bcf1d028bebd747b0b9467322a0fb87a5de1f7074721ebc2b9931eaa1c519fcef0388a61a8924fea9 SHA512 88e999a1bb1d9993d150347db7b1ec340978594cd2543191646e54d8fb5e125a68063916f048cc1a7166ccd646d66ea33f7f37d94ff20ed21abc7b7c8413e222
diff --git a/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild b/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
new file mode 100644
index 000000000000..ab4c265670d8
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=13
+
+RDEPEND="
+	sys-devel/clang:${LLVM_MAX_SLOT}=
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index c3e5aa9630c1..37a27c68a863 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -6,8 +6,10 @@ DIST aes-soft-0.6.4.crate 99980 BLAKE2B a4b3838e0348ed3d7468f9d0e19d8dd45071ec54
 DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e8974eff2e4667194ac147dc3a52a9bed1b00cf7735d3671b6a2bd135cbb4dbde822d7c8c21af23692d3e71f SHA512 726e5213a81ea021d4be7c5220d952cb6f0cb0ecb6cc840b542e9f75539e37fc5d6378ad4f4d6a2bc7e7642ea07a18202ed32d3b6a212777bd7abca735c6707c
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST anyhow-1.0.50.crate 44096 BLAKE2B fe303c7380e40bd9dac617fc25129fc96a7100a4da8c3476557cceef9f64dd7e9dec0623cb1da269fcca3d6cc35f9e7b01253ddb59ae4f12c276746d4948dc00 SHA512 21cd89077680e877143e9ba88c4af3a91465dfcd81ff6f08e2840fbee1d718d8a5a94b332641d126c3a2fe6b8e8509e0eb8337d987e0ab25c65dc7e71261d30b
+DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -41,6 +43,7 @@ DIST charset-0.1.2.crate 14490 BLAKE2B 78e776003334cb5a7c8980b8f6f5563b0eb3da8b9
 DIST charset-0.1.3.crate 14330 BLAKE2B 928771e37cc4f86f49cf09b671cc016cb662275799f34159dff9c22ca61a71d722f199ed36b2fadebde30b5763cc01d87bd6f27e70ff8ad357df10d6ddb652a8 SHA512 61166acd4fba3330c4c71e101e1993717baa448d91dd9773f7d58ac504fa4025322560ce82bd7de1b5935443f96ba84691658e5c982192196b325f52dc48f4b1
 DIST cipher-0.2.5.crate 13099 BLAKE2B a728a53007340dcc55da52cc170e5b801c8ad20c4e159d31200d5ab7f8bf4407af9a60713b4385ef0d65c06cc81692cfbd7339cb7449367d1eaf7c529ca34373 SHA512 e55627f5424d9b566dfb0787eebb1fb17ae98b4016c9091e87040ed37b36e0256b7681958a0d90aaf06c125c71123270bf986128ca1e0dc125f3162a868848b9
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0abcbf584637388c4507f89fd5284120759c9845219c463cf066f6568191b874fefddd7edee9292ed02183123161074514 SHA512 84e348dc3d40c73c11c54ecd0f1e6cf7fd6c7033f4723a428ed1c09bc9548cf317a0d8182144b689cb9781190b9c8ce4374717012eccee54a11ed0869dee10fc
 DIST configparser-2.1.0.crate 20039 BLAKE2B 708fb01160097215d3cbd449bb89f8ecb8dab09dc4b675ab410e8e636ffb96f7623bfc7e8c55621915652140e2ae4379dcfad61efaf7386c8d9f0ed99de13c4c SHA512 af459b2a3c228ebff981b1b6a158ab84af44a2037b499abc45c43234ba1014c826407a6212a9c36fc6a7acb6bf6407cfcbf52b72a35176cf7dfec94d0515fd6a
 DIST configparser-3.0.0.crate 21163 BLAKE2B ba44fd6c6bd3541a15dc77f1e9435236a7b3ade77a5d2edb993e07975da39b3444347b424acadf1dd85b6465a01db7be0e9f1c55fad435eb6dd6835da1aaf28e SHA512 3d4c1061cb58f7d388c611409e835001bc0c817e5e6969c5af5960d11872f76d8145300b03dd104338bccea15a558784f9e6a5a879d6df70531cb9ace9e2ddc7
@@ -52,6 +55,7 @@ DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d4
 DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crc32fast-1.2.2.crate 38113 BLAKE2B 8ceda4190d9034cc16718719dc23cc63fc8d24dcd9acc8983f2ebca5fb750364f9774268c3935300987c29eb8d289b72f05d44b0bfdd708d3025322d57adf7e2 SHA512 a8dd0ebc180acf47ea89391949c58c430751663c07fa2476176aed6a6e19f58c5737ce4afc1a7ab9781370eab6515f25416456b3fa77e475e2c8abdb3ae3e918
+DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crypto-mac-0.10.1.crate 9531 BLAKE2B 6a26505762d8d466275fe7674de1c4f95686b7a5fe107442361c892ba3123213e3f7cfb8d5516219e84c44496ef342ab534ebca724732e509d33fb9300027ef4 SHA512 39b7d966ef2df4f01a6b6f43838ec30c9df4a51106ee42d8d349f2d826722834ad5f7875bf68d7359799015d53ed45942d71a10f701fd080e264b21a89879dfe
 DIST dbus-0.2.3.crate 36325 BLAKE2B 8ab6cf46f4e139a91ce7e4068362a150f4041ce7a2db4db604203d65a122bba7d0311b430bf569555b48258017603b0540754868c0babbde867bfc4a90c7d9a1 SHA512 31398900fd3b388c02eaec0eed568add3c26ab862f04c391598709ff35d851cc8833b6332864973096257f27f8d405b617beb83cb5c2090900bb8061119e4c1d
@@ -116,6 +120,7 @@ DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d9
 DIST hyper-0.14.13.crate 171435 BLAKE2B d37893df6abbf06a9b91ed845368742b0e33499b6626ddf09bf9d2ea0dd4e8e689e1a395068a8243f9a4fd3474b47ee3ff3516982a4bedbca74e535388414e91 SHA512 a0db865c26a95ecb0921f9941359d26bd41daa026836796b8576d89e4ce76bf23177d6f61d0c7d9e9cac51d02559bfffa11eae84d36d7afbc0c03a448a8b85bd
 DIST hyper-0.14.15.crate 175489 BLAKE2B 2509f448ce9c101ec1fccfd8946d3800b76591a97252fe393b81f0b7960f4cd1f1fec543045aa431e50b2c1f20a7be06c5464c8f40be6ce6837915750637729a SHA512 0d60aacc2146107de291c53c3cc275066140e54b478db81b6f77e4ac44cfb634dbb4858689d0f0a43c12b9f38c723ceb30f6d8a8912b7eb22ee6af04a6e00283
 DIST hyper-rustls-0.22.1.crate 26718 BLAKE2B 69bdc6de6ee9058a3d782be27147f4856421f7e0ac6509d9e94bc955f4f392e0c9e904d2745868a6cddea060dec7b33f230d0eff17432ea513e1c8049d1f2cb6 SHA512 90c9b430276b553bfb771fd67f81eb5b782b7c5ab009eaf862c26ca330befa75e61f8d890078a9e5510ee6e1774d7f8def146d0a9ae92141951a59e1d94ebf41
+DIST hyper-rustls-0.23.0.crate 29432 BLAKE2B 8cedc669daf9a08752a185096a413c93d1fc1b423757c4c458757c1553b65af57b1f78436201ca0e3bf90641f4f21cbb0a1ed45e3d200d696ead841eb5e162db SHA512 b8679b5d5f03a8a3b3b3adc8f5cd0ba7355dcca0aeeef25ae65fe2de7b879435e88e920efcf7fcdccfc7cd6f1789aab767f60a3bef4ccc0161fa5a84b54237ed
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
@@ -129,16 +134,20 @@ DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939b
 DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
 DIST keyring-0.10.1.crate 20169 BLAKE2B 0509c3a512124e08cced67c227373a3817f70c78e065f2d391609b4801905fd774e7524688470a5c9eee23cf64e0158f8ffef545d25a88859df76f37c29c416d SHA512 a133d3908906d7b48c2986eba7525018bcf52d9e0690a2b1342580f9d4b9ab5165b800a853c57d7a7f41fca26487fd42b01eb7b75f5c4f0b623fb9f564ffd011
 DIST keyring-0.10.4.crate 22959 BLAKE2B 7a7f5aa2775895f35d47297d65490a675559cef93302ac62455d4b9662bb1cd4682ba2742838edc52b0b470ee2a3f05096f7679cd09986917ab27c89e718affb SHA512 68497fb8f4ced09a5a812b7c0d0647f68204fa1682cd4fe76ea77dd1e641495e34b56c50e0cd12b9284ad07fe716d29deee868d2bcd7ea5d001817869527b9e7
+DIST keyring-1.0.0.crate 28990 BLAKE2B 2309a9d3cce6053d0496dc6699e23ab5947a62fadd48d2ad943b7271c1cc78962ec53d7d674e175944e9a21f9a8b15cb947ed215376baf466e3c56a6ecc0b657 SHA512 988aa67d9fbec41a0704ed611a64bf93fbf38ee5ba02299f0fa0ebcb7794f4003b3b1161e4ff4da9f2d71a83706352e12a5759aad099e355435b82fca0342bc5
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
 DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
 DIST libc-0.2.108.crate 559475 BLAKE2B eb8b0250136aa57e89d256d8401fb590d74a1447039324ab4572786185a2f4b7a955c356c8cab63b019619617313fafd5b7c44dd09cfa3cc92dbb9b7fb714580 SHA512 a29f0c5cc7e4b653c2bc33c92dc90b5d3a7132d4409d6b92b94fa9fe1391d8cf57a63d339ca0602f2efac28d3dc3beb854cf9a6d03bf027fef5e5276fc5b1487
+DIST libc-0.2.109.crate 570506 BLAKE2B 629146033110c42a380a8e87f09af04773bfe9609b8430fa5ec8d85b3d8431e430b60b072e436c479aa8f0037410f1a642bfdb92e4a932ed2c875241bfd63eff SHA512 ecc5cff60ef7ef4febae95cb3ea4fc130b1844ee20d046332ea0738c85ce1c0afe9239d9ad5b1a50236918aa1166eed04b5a91ece76e49099e4a5415bde881a4
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST mailparse-0.13.6.crate 34804 BLAKE2B d3e88b5ef7d97e06f0b75cf14f2134c5dbc9516a002c099210f2ad1912a9a5e86765fef5eb61131882a70eaef1ef44a57a0f10c3d88cfe8eedc4dfff2cb77881 SHA512 35abe8fdd944f931462b95b55081aae2b3c986bae342baaa0fb1bc179c1f31f68202648426c3dd8ce3c6839d733803dc09fa67684c165125c60c7fbf26cbded2
+DIST mailparse-0.13.7.crate 34737 BLAKE2B 33ce9844ac364c80c57973e6afe09953f3e73385d5fefc390e42d6018c91a55a25b92bed1df9ec7e3f08fa822368dee8f88c35cafa3a8c5d2936477040c00599 SHA512 00c7e418c3625b7220a677e76589ce7d00d0873d28461716a30d34e2e92f67dee75a64c2fd53b916993240c82c5741fc27ec1d074f80f8d044e6626ecca39f12
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.11.5.tar.gz 584266 BLAKE2B be92b8b3f94e7b5e5225a57118219cb854ea072a03b92b5811a135f54c634b89dd52c3c6bb50be539b7578e3748a34fdf4552bb46544500b061743c7dbd92ba0 SHA512 31c32849fe424393351c6f895eaf76852647fcd6b5bf77d1244147315c4e730762c03d49d898bc76805dcd0a6ed8004e8eaf26a2f78af2228f8cfd3cb2201c7b
 DIST maturin-0.12.3.tar.gz 264117 BLAKE2B c98de550c99c378e6b9e90118acc7e7b67184455a447165840ceb109611e92c1fc2b1b4512dea16c869f3fa5041c0b8906e5767df6f06d45c308045bc4ad5f47 SHA512 2a568dacf09a01f7198570381079c61c98b1771a2e447cd2077256436a6f9e566828b6e9064c5ca0a7aa8de0e442602ff1940f454503db635bda9682614165ef
+DIST maturin-0.12.4.tar.gz 269863 BLAKE2B 422eec4148114dbcca7f8a9a8c60c872ba67df330ffa96972abc5481f593e17770e01c08adae2f763424b09f7172701d94d598a57ef068a599b4a6df38288a50 SHA512 fff317651501f142586826692adf1152dd82bd3d8a5aade337edf1f688a1c12ecb13a5ac1978c23f1c798ea140d5dc87ae3cc68ed73974a52dac3ff30ee1d031
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
@@ -189,6 +198,7 @@ DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed
 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST proc-macro2-1.0.30.crate 39155 BLAKE2B dd0ec47a3a54fed6cb3b03e5edb5c3e065e5644f631560595eaca028926f283ae20b3e9fe699b0b968e00d3bec6ec95437be2693ccdf22f1524dd5e4ba3f7886 SHA512 d07ddc18dcfcc163bd243c22ffa4735bc300f304c7e70bfa7caba91047b1313bfe1f18aa4707a65a40fa18115c4b32c57b23699f9a4d9b4a09fec3c8aafb1d34
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST proc-macro2-1.0.33.crate 41040 BLAKE2B b4c68569d54460a4441ff64ad1cad1c9d8109dc3a9fedf037e61ab61d204c424b69daa85199bf4e47e6e74aded91ef4676253acc9a7dfc0a5c73c84544d825b0 SHA512 a4e0aaa92eae63c6e8dbafd2fbb7105e58b10f576863eee66e764c133ce5e3360da8486581b9df4379b7b3a101976a5962d4f648c416eb4c5979480232eed40e
 DIST pyo3-0.14.5.crate 330805 BLAKE2B 6ab0b487da4986a91c4360b2f5783fe77514d99ab79aa4fac18c4889e1f0077cf3d58ada0762d96c1cb7c93a6f2f0ebbe852ea881a23b1b5b39f6b974cc965b7 SHA512 050cf757cf3d07dad46af1bfb0a0fc4b4b7ef677af15d2119ef3eb83cf0bcaa02540c7e5c04a0c0653813e6041221754d3af6b6ac6041e9287fb9d50121c5b35
 DIST pyo3-0.15.1.crate 370722 BLAKE2B b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3 SHA512 9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
 DIST pyo3-build-config-0.14.5.crate 21440 BLAKE2B 8f0529a38b35893f82461d18c456eea1791c410c3af391443df892b897fb3f98d06bc802fd5a3c4750464fc91b532e703322c6637960e8c5bafd6f21ca0de61f SHA512 d955296d122219f5b06e29c23ec9f384e0f3aba2c5300d355fe755472de855e1ccb0393aafaae31288676d6fe85a936e61ce5f9232fcdda2366e865f28eacdea
@@ -219,11 +229,14 @@ DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226e
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST reqwest-0.11.5.crate 136526 BLAKE2B 23ed54d3bd88a1c545727283b1090ef2eb8806537cd1f0e584fb899b9db1c0850d25a471ac57f92dea464e121879c28f199774b1400616ab877e147a4bfb9d09 SHA512 59f624e7018fbbd9eb47b448356178196d315792e2418428ea1371a3c2b87417be4aa27d3c75e992bac525cbe95976a6ff481fd2a7661d56aaad3a8c3052cf84
 DIST reqwest-0.11.6.crate 137108 BLAKE2B bc50db076692e89b2a0c3cdb898c2b531c43d51b2d3ce646e1e6f96434a8843d879baf1a77cd65b3a5b2269ddea942cfb0b1ca404afcdf11224b0427805f86fc SHA512 39a76ec1667fb83c5315f5d49c2a4325e14c5fc46c23d5d519449cb2284be3e24313d91007274626e473f1cc663594c018004b9ed1f912292550bed15e0fab1b
+DIST reqwest-0.11.7.crate 139871 BLAKE2B 6120cf1c7419d373a6efe6f4b12714ca5eeb06b27c561c4d4420825ed4f839effb934aed0cce0f6361ed135662e1cea02944cb0d727d2102206a149d964ac38c SHA512 fee86d3ebc2d954e24faec1e7f42514395b106fbca689e5e5f3a9f9689e8f0024a5bc602095483353fba9b4c50b5e85a9141b59e1fd189bd8badc0ce2a31d0b2
 DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rpassword-5.0.1.crate 11109 BLAKE2B 4d040a920673de6ad2f2cd55104a7c2dfdd7425368c77aa3c8a1f3f99e51cba4d86b2afb16ee51637d948e444ddf060f7a0c82de5d6f0696023c527e630eeb56 SHA512 bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustls-0.19.1.crate 208143 BLAKE2B 2ec02f40bac911d85db013cd99fc859fc4815f98114abe7041cee61bc106e83334378711d0acda916d9cb72a78f8d1a7237bd5d0a51ceb928d98bbe75cab93f6 SHA512 c86b0809f7cb2b31cf9c87d7744334ea3a0c743e26303026ab48194435289b1face6a7009aa4971f719cf31d7f84bb0e56e923cfd326ce0bc4ed990b8c9aeab9
+DIST rustls-0.20.2.crate 238289 BLAKE2B 9e707a3ab7bbe07b4bc200cac805e7a723e03b461adaf4ced74a1d3b432c9647850189f69112a382d3063cee51aab377df50ca7835aaf1039bae8ed4b8c25ee0 SHA512 18e245c0cf96fb9caa6b09be69fc8be0e580a2d0521055a4d4011a506c022be62e3c8103708b2aea8f3dc77274c97cbedd71e8affda9a3b260335d24d062ca4e
+DIST rustls-pemfile-0.2.1.crate 14278 BLAKE2B 2cd27153a5db80581e43009c0ac21209f57341e584c8f11789bc9e9ac71d6cc456c60554bd97176c7567ad67896b74acc6372c62973a3ff1e965bd1d0dd52bfa SHA512 1c03cd74314bc0bffda4803f6e7692e53e3cf67a6bd30e6c96a861d8c118363b0e871a9e28c4e1a4d4f1fcdf98f3a5af3be5f0250f3653836429a27645a10c80
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST ryu-1.0.6.crate 50032 BLAKE2B 13e805124f80de0d8175fe8b315b20b06f0ef188049e835843b91ffb90322bbfa54ddd0fe1617af851e8f5b59c1f076252b705394ed3408b5fb577059a46273f SHA512 175da99ee31a942800eb33ab5addcdf89b2bba95b6289be1560746d030acda547a5bc3e8cba714c252230a93bcd991b9593a7c94421222833bf089694ccf1655
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
@@ -232,6 +245,7 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
 DIST scroll-0.10.2.crate 27810 BLAKE2B 969202d13e99c12bdd7e5aa6cd6bcd47686d53c8180de6f40f86bdfa0b3cb817fb350a5b6ed29f9f76ec4c554a370731aaee330c86288e0d2a3ad478da413f20 SHA512 70d4f17d4af5be439bfd0a2114eac6eb8b13860e30d5b092aea0cf62bcf817d29ef7d68c5d7488abc8f90f7ca99d4cf2cf44799e6541058f2f4d0c0d99ca5764
 DIST scroll_derive-0.10.5.crate 5783 BLAKE2B 1ba52fb972bb051fb0e2f9827db55966058e6747a41b54de9d43d9e34105c1c4ad45f758ffca597d7aa13f8ba2d2abbb2d1648883f51458c1b8fdedef5234cd2 SHA512 029e024921d558c14113f16b6c406c766e9065d37b6e0a43dacf4da6845eadb780580a7e0e9d5c78cea02859e2acd842e23855cee193b1a533183550f2d595cc
 DIST sct-0.6.1.crate 26825 BLAKE2B 162c72a8e370237f846125de358f773560d94acae2675bfbd07719ed761c112cde04e2f59e13378fce33b725becb094775c76bc04baea2abc34dc25493e86d7c SHA512 78d17cc8af85c386fc37fa24e71ce7744ef214cb77516633098466da0ed02df67402c981a4cfc2808f4a51224f82e2600afe4449446e3d483cae240f703423f2
+DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
 DIST secret-service-1.1.3.crate 23126 BLAKE2B 6ed10ca8a8e458c45b67475fecab18559cc359b0cd9af0be724bb63b8bfed53ff0f1cce6d0f6c0ffe505f3caaffd83384ce1c415c20814dea2b3fca162db9be6 SHA512 031a715fa18af39d24a4a12331d59d9b3ccf4656849efc77840bd9288a9cc01c9e666bb6aef67a2b9c3033bf4b1de7f176e31a42072a6a06fa76ab7204afd4a2
 DIST secret-service-2.0.1.crate 26355 BLAKE2B 01d0457e7fe16a2f86a67a3e96c6acb3b68bde05cd89f7446e4a248c8832dff51b409a106b73b21e9017315da603fd79ee9dbb1f1552f1c56fb9bfcc70eac5f0 SHA512 b7d348a236719e8371e17e71931f764edc1e7a0a19704cd85643ecef020769ff6dbce4f9169ced5167441c4d87fe77fde0b45a3bf39a482ff9dd35f625094c49
 DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
@@ -280,6 +294,7 @@ DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f14
 DIST tokio-1.12.0.crate 522732 BLAKE2B 5506c495c4a35c14144bf677ba4626cdcc0ddaf0a0e902beeff50dbf05161392d0a5c0d7f4c49478b8180d104dce60f43ddc3c2f1ab0f3b908520bda59a5caa2 SHA512 c6bc29623bc41816578a2e74c2793830b5fbce701ac5fa98033d5e5ba96ea081c744c690686c39db6837893a200d7d55cc5bb2270e66e1d7ac5cb7103fa44384
 DIST tokio-1.14.0.crate 534070 BLAKE2B 5e15babc9a2ff9c74e71174bcaee4f34fc88038983a870aba7cb4beffa79eb5ac1a4bd54718971cf193bd85f2664c274395090105b4ae74f86e81c23aceee9fa SHA512 b9961d0be60b0ff6d5b11dc74b69ae8406e748201de74d3789d1c8b2c996d8db6359a7089123ef24c5b1a1e86f3e282b6e031a5b99a73b6ee9e8b24a6fa1c7fc
 DIST tokio-rustls-0.22.0.crate 22706 BLAKE2B 9ef76b96aaa10f49692581f7b4f04063729baaf3998b7e0a3d5700cd7613822efdc7fec334ec9d3718c700fbcbf572ee974e96bc3f79eabc774a801501b08ef8 SHA512 cac6c5ebbdb751721f881f6e4c21e1b34ff8aea84256e25f92cecbeb30b6db3a6b2d78b7eeca253179b78a94c9226aff23492b0311d81ce27470ce939e675d0a
+DIST tokio-rustls-0.23.1.crate 26624 BLAKE2B 3ad77a52494b681428adca1ef160881c64cb40f46e3fbae8ba4caba8e756832019c0d8a9cb340addcebe3b4c110bbdfaff6798cbc2011628bef3b6e680cbe118 SHA512 04406172d084fd507fae969df42d24e5bc794eb99bf028c77bc148ed03f9be658bb7d6064fb5ed223a19e432a6c6821060747f5aaa0b5931c6256104b9146edf
 DIST tokio-util-0.6.8.crate 74116 BLAKE2B f47f61a1566b721ef5294526f6b0fc08a5662eee2b12def6b699de38e6888e3cb61623a76a52a71843449a5657ce3829bd5fdf2826428e370b6d912320c5863c SHA512 b81ee8086a069de580bb2769145a77d12d3ae2c4d8a689d979c58988c64b221ffeeeb0f159181f92f402011931eda8549ff173b227433d6597492dc7f024b7bd
 DIST tokio-util-0.6.9.crate 76480 BLAKE2B a16fec47a50cef0ada375715c391cfe8239a92a89dbe174ec0afa20281ae28dbbe6fb62029a678765d885aa8dd7613138666be5fb00c660756237bede980b82a SHA512 95b1bf648106c73bc9a3e63cf438a5fca2969cd9425dcb54aa31f5471a6d68cfd9fd99da0b8c86a3b268e618be77f3957d7c88fa072c970dababa4d8965f916a
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
@@ -315,6 +330,7 @@ DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f
 DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
 DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
 DIST webpki-0.21.4.crate 58505 BLAKE2B 29a5fae21d885e90be8fa0b78a9b164f925e881431e79e9ea9702e8458242559c3f5b5535e04ff3ffb2018c1831b7dd685b5cdb5b9aa9942f6b9038c403da363 SHA512 667c9dc1c50a3d99aab53b6a9974f503e5c88f79012b3c94386a321761b96a74cc743a4e3b85d8314c36cef5ef01c2a2faffa80c773be1ba9680af4f21af3119
+DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
 DIST webpki-roots-0.21.1.crate 223591 BLAKE2B 9f3a2720a1b65112fbf8661216195598de9da59b0bc028f0666077150b02dd873cd6f7ed820f47877b4a37a1840dcaaddfdce91cce02473ac14d3b864677f332 SHA512 12563743c86a908c9f56c25234e08d810de418d80714bc8d2eb36c8500b5bb02f28f50ba2d53fb162cdce8ab35db0103d9f63f064d44ed8c17523a93418ea72a
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -332,5 +348,5 @@ DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25
 EBUILD maturin-0.11.5-r1.ebuild 6046 BLAKE2B b95dca3757e9c0ed80196f8f637559f0c2efdfb184b1d6c55209fe1efb7dff9442f0825fb2452111a076632004c6580e76af867c4001c13f5dc89b255471571a SHA512 ca67fa7c20ae69570b0ecc885bcb3c050aad1db34a171bbdf26e7d3d991a59770992c9862f91b1068ec83422d751a3984d16e6a3bd5f9554b575e343befb5191
 EBUILD maturin-0.11.5.ebuild 5553 BLAKE2B 4ed1a53fa77f99f5cb3356064860e1b5bb83765ff9b556330ec1647b3cd195f3c55c3fcecb309072c8a8be2a6b71e71efeafb605ee0385b5fdff464d97702891 SHA512 0f02023d890b66e453274f9880e1547b5a4342109523942010ded8803466789823001e7a1dff0f57522f970c127ed42c64803eda42306e4189277bd5c9808b58
 EBUILD maturin-0.12.3-r1.ebuild 6714 BLAKE2B 3c7ac64c4f13ea9271b9c537f4fe92ca21c80297b5ba84e95b8c18ec6ffd8d4a03524de2aaf0837b9d13de30811e080f0f01e4ae9c40dc9ad13e5a4291614c34 SHA512 82a792e1ca4d363c716d312f74913c5b76f879b12d3bd05807d4ee04ae5e5141ecc3fbfb2d5526185c9ca06481a1c05f19045e8b74470a06dae247d57be2f1e2
-EBUILD maturin-0.12.3.ebuild 6104 BLAKE2B 6cc5e9e1c3b67b543a5aedcda656f7130ddea2ae91bc9b3434fdb066bbec393a00cf387b6bb0286f6064d39f290d09e4d133a0fbce2eaa3dc5179a13e2286ecd SHA512 7e9d22cd03787e0445ec57c80afb45f39b51fd30604ac87ef7c79a04ba5e8aacc95bbaff4fd4ddfa56baefc053597891de09cb00bac6d2e34badb7eb0ad0766a
+EBUILD maturin-0.12.4.ebuild 6790 BLAKE2B e73e9837500a3c51881daeb416777632eb9bf8b5314416716eed34c629f8a99b321a1dd63d5e59d97ac1420be84eb04e6a9548dc2f006a2e5dadbe3fb2a1d18d SHA512 3f47a61d4164f7610e1568542ce2c40d92c9cb1356051ccb125fa5829419b2169dbec09fc22b3252aa5b1421d6c44cec5e7d1a4de05de329d75746b98ace5230
 MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
diff --git a/dev-util/maturin/maturin-0.12.3.ebuild b/dev-util/maturin/maturin-0.12.4.ebuild
similarity index 77%
rename from dev-util/maturin/maturin-0.12.3.ebuild
rename to dev-util/maturin/maturin-0.12.4.ebuild
index 373c0d076c2c..236323cf33ec 100644
--- a/dev-util/maturin/maturin-0.12.3.ebuild
+++ b/dev-util/maturin/maturin-0.12.4.ebuild
@@ -10,8 +10,8 @@ CRATES="
 	aes-soft-0.6.4
 	aesni-0.10.0
 	aho-corasick-0.7.18
-	ansi_term-0.11.0
-	anyhow-1.0.50
+	ansi_term-0.12.1
+	anyhow-1.0.51
 	async-io-1.6.0
 	atty-0.2.14
 	autocfg-1.0.1
@@ -38,14 +38,14 @@ CRATES="
 	cfg-if-1.0.0
 	charset-0.1.3
 	cipher-0.2.5
-	clap-2.33.3
+	clap-2.34.0
 	concurrent-queue-1.2.2
 	configparser-3.0.0
 	console-0.15.0
 	core-foundation-0.9.2
 	core-foundation-sys-0.8.3
 	cpufeatures-0.2.1
-	crc32fast-1.2.2
+	crc32fast-1.3.0
 	crossbeam-utils-0.8.5
 	crypto-mac-0.10.1
 	derivative-2.2.0
@@ -94,7 +94,7 @@ CRATES="
 	human-panic-1.0.3
 	humantime-1.3.0
 	hyper-0.14.15
-	hyper-rustls-0.22.1
+	hyper-rustls-0.23.0
 	idna-0.2.3
 	ignore-0.4.18
 	indexmap-1.7.0
@@ -103,11 +103,11 @@ CRATES="
 	ipnet-2.3.1
 	itoa-0.4.8
 	js-sys-0.3.55
-	keyring-0.10.4
+	keyring-1.0.0
 	lazy_static-1.4.0
-	libc-0.2.108
+	libc-0.2.109
 	log-0.4.14
-	mailparse-0.13.6
+	mailparse-0.13.7
 	matches-0.1.9
 	memchr-2.4.1
 	mime-0.3.16
@@ -145,7 +145,7 @@ CRATES="
 	proc-macro-crate-1.1.0
 	proc-macro-error-1.0.4
 	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.32
+	proc-macro2-1.0.33
 	pyproject-toml-0.3.1
 	python-pkginfo-0.5.0
 	quick-error-1.2.3
@@ -160,18 +160,19 @@ CRATES="
 	regex-1.5.4
 	regex-syntax-0.6.25
 	remove_dir_all-0.5.3
-	reqwest-0.11.6
+	reqwest-0.11.7
 	rfc2047-decoder-0.1.2
 	ring-0.16.20
 	rpassword-5.0.1
 	rustc-demangle-0.1.21
-	rustls-0.19.1
+	rustls-0.20.2
+	rustls-pemfile-0.2.1
 	ryu-1.0.6
 	same-file-1.0.6
 	scoped-tls-1.0.0
 	scroll-0.10.2
 	scroll_derive-0.10.5
-	sct-0.6.1
+	sct-0.7.0
 	secret-service-2.0.1
 	security-framework-2.4.2
 	security-framework-sys-2.4.2
@@ -207,7 +208,7 @@ CRATES="
 	tinyvec-1.5.1
 	tinyvec_macros-0.1.0
 	tokio-1.14.0
-	tokio-rustls-0.22.0
+	tokio-rustls-0.23.1
 	tokio-util-0.6.9
 	toml-0.5.8
 	tower-service-0.3.1
@@ -241,6 +242,7 @@ CRATES="
 	wasm-bindgen-shared-0.2.78
 	web-sys-0.3.55
 	webpki-0.21.4
+	webpki-0.22.0
 	webpki-roots-0.21.1
 	wepoll-ffi-0.1.2
 	winapi-0.3.9
@@ -259,12 +261,14 @@ CRATES_TEST="
 	indoc-0.3.6
 	indoc-impl-0.3.6
 	libc-0.2.107
+	libc-0.2.108
 	lock_api-0.4.5
 	parking_lot-0.11.2
 	parking_lot_core-0.8.5
 	paste-0.1.18
 	paste-impl-0.1.18
 	proc-macro-hack-0.5.19
+	proc-macro2-1.0.32
 	pyo3-0.15.1
 	pyo3-build-config-0.15.1
 	pyo3-macros-0.15.1
@@ -273,53 +277,76 @@ CRATES_TEST="
 	smallvec-1.7.0
 	syn-1.0.81"
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo flag-o-matic python-any-r1
+inherit cargo distutils-r1 flag-o-matic
 
 DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://github.com/pyo3/maturin"
+HOMEPAGE="https://maturin.rs/"
 SRC_URI="
 	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris)
 	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
 
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl"
+LICENSE="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl
+	doc? ( CC-BY-4.0 OFL-1.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-PROPERTIES="test_network"
-RESTRICT="test" # uses venv+pip
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
+RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="
+	doc? ( app-text/mdbook )
 	test? (
-		$(python_gen_any_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		')
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
 	)"
 
-QA_FLAGS_IGNORED="usr/bin/maturin"
+QA_FLAGS_IGNORED="usr/bin/${PN}"
 
-python_check_deps() {
-	has_version -b "dev-python/cffi[${PYTHON_USEDEP}]" &&
-		has_version -b "dev-python/virtualenv[${PYTHON_USEDEP}]"
-}
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# use setup.py only for pure python and handle cargo manually
+	sed -i 's/cmdclass.*/packages=["'${PN}'"],/' setup.py || die
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	if use test; then
+		# used to prevent use of network during tests
+		cat > "${T}"/pip.conf <<-EOF || die
+			[install]
+			no-index = yes
+			no-dependencies = yes
+		EOF
+
+		# run plain 'python' from eclass rather than auto-detect 'python3.x'
+		sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die
+	fi
 }
 
-src_configure() {
+python_configure_all() {
 	filter-flags '-flto*' # undefined references with ring crate
 
 	cargo_src_configure
 }
 
-src_test() {
-	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock
+python_compile_all() {
+	cargo_src_compile
+
+	use !doc || mdbook build -d html guide || die
+}
+
+python_test() {
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \
+		--test-threads 1 #825242
 }
 
-src_install() {
+python_install_all() {
 	cargo_src_install
 
-	dodoc -r Changelog.md Readme.md guide/src/.
+	dodoc Changelog.md Readme.md
+	use doc && dodoc -r guide/html
 }
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index a32deb35f33c..f94f100e31a1 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
 EBUILD pkgconf-1.7.4-r1.ebuild 1519 BLAKE2B bb7ef98d18c414eaf498484e9d2281ab2171db86b4aebb0be79126b5090ca4fe24faaf8f081f7fb48671f0c0c20fc4a6af7c0941ae077ee515956d68ad1aa16c SHA512 f8e615a911386599c0365fc5719e5021d45a6ecfbc1ad8b5bdb4c7a573de95c381da195d24e7157b1625cbc83b2d597c95e573ee4fddf8a87c1d4a5305804b03
-EBUILD pkgconf-1.8.0-r1.ebuild 1579 BLAKE2B 5fc39d7f40772446573331503ecc9cb4c161af4f5e0dfccd6b57560b977c34e33f37cc580e1700f60c0ccb8d70f2a194b7ce552e86d48f97760cb21af0ade844 SHA512 766dfb254c6e3ddc729c34e9cfdab22bd94bfa6d800ef1ed4a002f00c173a851a5843376db46b984e5d2b2de5ed9b9579eecee6f7124ea009d88fbd87cf4a73f
+EBUILD pkgconf-1.8.0-r1.ebuild 1578 BLAKE2B b3128525d09ed8b7fe1a36098472ca0187decc652dd3690bc7e70f6999636773ba719ad87b8aeb12a890210c95b03d2b26a2bbb504ee32b3fc54393f53c0e53c SHA512 755c018ff045ed92d6d10c06fb172cc7e1570d0baaced0a90d4cf938e10df32d689a223b7d67afc44d832a1b1fffb61f2d60514975b782eb4c0e0d9e9f2c9e8e
 EBUILD pkgconf-9999.ebuild 1531 BLAKE2B 02e5c632a81cc0673903e44c7d708d75a002ba9e6d058626c7686a46b42496194c9e01fd7c8b2ecf228839e6be52f0fbb4bbc9bb09d35c48ec35535fa3719346 SHA512 b2499096796c0645d346e7e0d722c1b38f797b3bf6ce361f8cd76ac1ce59e4f38489c5dc8aa428a862dd4babc176723eeb6fb17f65779a638ce77d96af765844
 MISC metadata.xml 594 BLAKE2B 41e097bde16856411e4423d63898129e9d11059f77a89f8ffa5dc196fbe9c97cd8a27cac567c511eeca7eef57436826148713557ad0c5359e875b53700e88b27 SHA512 59efd28cc254a9213af4b1fd9e3b55e19353027f585edd0014e38c304cec4639132d7bd98769e329fb4a7fbe243e91ba088d2ea36aa53320d25d87e1952d255d
diff --git a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index 0171fbe95665..d81df3aafb85 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 0cbe755e7b83..231a99c873a8 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,7 +3,7 @@ DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b2032
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
 DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
 EBUILD strace-5.12-r1.ebuild 2429 BLAKE2B 4d257cb5a891064a0dfb24ec69567b72cb3952e380ebcb69b0e2b8af6ae19fabe6508bdcec3a6c711b8a1ad10c7ae27eae9121dc18d990694edc2845725be138 SHA512 65629ee3a380a6ca9aca597f628d4e8e7c0caea6cc8b6e5f0d1529ca171bba24107ae3bc6b57177555055240a8b31c10d77ae6d0c4fb1f0c4d160901ae613fd6
-EBUILD strace-5.14-r1.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
+EBUILD strace-5.14-r1.ebuild 2431 BLAKE2B d375471f937c0bb09bac05dbf802c04461ef6a4826ac49af2023a2821a6a6a06f93776fa76f087481fe26256988fc1f8e31ecc442109bfc1f950a0f18c01c757 SHA512 f0720400c4f0e7404a338f62f11e69f849bdb6d9226f81925185edc58ba8122b17c1474e67b6b47a842d1cbd66db05a14d63bffb726370be6d2039394d383fc5
 EBUILD strace-5.15.ebuild 2449 BLAKE2B cf34ec837986a9272c8f74b2b21bcae953bd2e4d6cb19258b93f2536642e12b770f541f5b9318220712e4c932e49bf57119d3b1cdf8139a75bbb1a04554615d2 SHA512 43194e23793515412488e219b72599f3cdb40b68b662ccbb2e650e106d7ba7f7952fe96e226098298055f89e94c2807e8ac2c1e333ca264b57c7823347db7566
 EBUILD strace-9999.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
 MISC metadata.xml 761 BLAKE2B 261db0087db2a12c260efcd80bae1dcabd1b518c7b7d65a7ce4cbd5a2fcf878af3787985d629b43dac0944fe97f7f78df964082c5dbc52da06360ec112a0e7f0 SHA512 dfe6bb1b1149f51947c964d55396c10df38ad68dd987ae3df66b1850b812717d282d41e59a38f35863d22eb7391b7be636b5272e361641c26622618c2cbff19e
diff --git a/dev-util/strace/strace-5.14-r1.ebuild b/dev-util/strace/strace-5.14-r1.ebuild
index 035be39c8354..fe576b5396b6 100644
--- a/dev-util/strace/strace-5.14-r1.ebuild
+++ b/dev-util/strace/strace-5.14-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 61ededadccb9..63f1b6214e29 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 960368b52256..630c51b842cf 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -4,7 +4,7 @@ DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124a
 DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395
-EBUILD git-cola-3.10.1.ebuild 2487 BLAKE2B a1d137c34a630b0d109be9920f843314c85c4c473270b5310789440e27db9afce439d9c9a158722e5883afb6064b788a2e9e26bd095312b71e2229a92c5cbe57 SHA512 b3c8b4e4f253fe66ccbe22724ad7919023d7c6a2f19b2076a7bf0029c34ccd1d09fe4390e7bc6f6ed01a02b45f01d129ae8e318a1725354b32d267603ea727f9
+EBUILD git-cola-3.10.1.ebuild 2486 BLAKE2B 8ec3e8f3737b1955a6169a2d6997d4ee9d9565fad0223955a5df1763d1e6ffb0fe839129d4eb4ea2e2986dd96e3f6a770bd472ba833234d3ca25d115643871c7 SHA512 458fe11168fcd3d839029220a5ec13731238bf24e8ae7120df3476e015d740de615e6d90c2e9cfbd22d70310a0fc6eb07bf92b96fd8301e30c84dfbb9b8659e3
 EBUILD git-cola-3.11.0.ebuild 2404 BLAKE2B d33e8f32a7c23839216e6ede77a346cc584a35e8763ece27968137c38ec2037c715cba16f9a8576a0b38caac410688237d5d19b0e2b47541ce3e1a0211b3406b SHA512 ac6699eaf45e8bdc77489017819351869db66d56fa2d584868763301d037fc272f4aabd78f22fad5fd235103422524b3a654853c62bf8adedf9db7c5027d144d
 EBUILD git-cola-3.8.ebuild 2477 BLAKE2B 6cc1a0d6f61526d6f145adfbce03ce98d117ebef4de0153e18220c2dc216f3fc046ce36f11751bba07d5a6e0e86298ddfa7203c22a7f94fe8721dc9d0aedc4ca SHA512 ce381d9f2dc31ccbf09930ad1dea21ab20cbe83080a1f86add25be93f38d117cfeed36d878693d20fb9d7e71f398e16caab2a4cf458add1312dddb49003c9012
 EBUILD git-cola-3.9.ebuild 2437 BLAKE2B d645c01f2291a0e0edaa25fd42f3e40e58ca7a0e366ae69cf229abee74d72c936f21377590e4090eaf33cdee46bb0f27f32be883b05d77fd78250a5283225721 SHA512 751c5e2aea3ebe73614a07d30bdf42ff395329ab5c63697df4659244e114f269ac43c526bb9a981e55111f3df43f1535cfe1aa76653019bfff6c3f31ae2a805c
diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
index 5445b39c1f59..4bc81af9e798 100644
--- a/dev-vcs/git-cola/git-cola-3.10.1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index e0895127d6a3..aae9f4b89cca 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -8,28 +8,26 @@ AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f30
 AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
 AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e
 AUX git-daemon-r1.initd 366 BLAKE2B b62642c38877e51259fea640193687c72b70b60f0956e225e1ea0087f86b44ed1483b293d94e8145db8da97d63d8e82c67ed67e80bd1759928b30c6460661e5e SHA512 9fbe7ff2c3ce0d22461e9d1401759d0f0a62039006f449b8b2beece85dbf37bffc6e23025f41527ff87cebb852710f01e021b30a659c4e1d71ddcbd536873412
+AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a
 AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec
 AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701
 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
 DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91
-DIST git-2.34.0.tar.xz 6623924 BLAKE2B 1b50fb2594ad7c87df5214495a0a24f8122f67e844b0312bbee44d9cfdad201fe589a819cf56971706df534001cdbd52d4174fa72124212d4276cee9acd37759 SHA512 3102c1ebe408eb549ebd0f9b1420663ed04a2720e4dc676c1854a9e7b8306bb49dc931b734aa7eb612eb7adc2ad92730c0d2dd704dbd859ba61e5ceba909fcc3
 DIST git-2.34.1.tar.xz 6623760 BLAKE2B 9b5d7a450ec495898bcc0e1f6ae87c0ad102d039cf7c4106cdfe3ada501d9bfaf22b83c522de383d3c01f7d5a29dbfd7fc44b371efa8fc3a418ab3c609a692c1 SHA512 a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
-DIST git-htmldocs-2.34.0.tar.xz 1406204 BLAKE2B db606a9015a4efa8d162dbdf3eea34a60f87a85e2acbeed23ff731e241086354bd278726fb301eedc83ff9f44a71e3c68c78b151d4e837b32a188ad5ccca3b3f SHA512 8f6e768ebeb4dd6cc45537391c30f47cfab67fd7abb308d0b15a082a463c0c01cd94f855f9e7ee2e4b2983300d31431666ce84dc9243b0ec37869d5a868862c1
 DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
-DIST git-manpages-2.34.0.tar.xz 497252 BLAKE2B a61b32cdfea99373edf227f84f8d5e6c6664f5399ce9b213f23368bd6029efe118e6de3ccb02beefdc5311487709916a245667dfe505e9f594e993641df7dfbe SHA512 367b047ac36213d62129a9bbe11617e10cf58a837f13896580dfa7ba2fe485eb3bc662d5b530ff8896039ba8b73219e98e2562f588b4589d27e8fece887d1589
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
 EBUILD git-2.32.0-r1.ebuild 18215 BLAKE2B e4e5e4a4685cfc0c6b9879c1b900e5be5ab1acec26ed6a070901987e3c538303430429ef92a94c2746791ea88bf01d07557479e6cda8655608c00ec682767875 SHA512 bcac636fe83b1e84c20288f8c184b836df340eacdbc7e4edae661c3eac320d43131bdddbabe5d2e8552ed1a8a0025825d6e4fb26a4c8b7e4e3497d48530d80a5
 EBUILD git-2.33.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-2.34.0.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
+EBUILD git-2.34.1-r1.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
 EBUILD git-2.34.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-9999-r1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-9999-r2.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-9999-r3.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-9999.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
+EBUILD git-9999-r1.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
+EBUILD git-9999-r2.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
+EBUILD git-9999-r3.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
+EBUILD git-9999.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
 MISC metadata.xml 2225 BLAKE2B 3744d602bb87d31fa9da5a4f6cc78e1d7251024323d1c2ad3f3e0b2ef78de61041fecf7026f0ada5d856139852776e8539b0a9f9fb5b32b3ae742ae6a9d09cda SHA512 3629e08d8ecfe05cc194f3ba03656308da2c7bcac5bd33cbc967b5a4269a60538ff4e119fb9d1a4e59c5d53c31659c55d5fdd0ee52473175147f8fae73a4cd22
diff --git a/dev-vcs/git/files/git-daemon-r2.initd b/dev-vcs/git/files/git-daemon-r2.initd
new file mode 100644
index 000000000000..453fd608363f
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon-r2.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/git-daemon.pid"
+command="/usr/bin/git"
+command_args="daemon ${GITDAEMON_OPTS}"
+command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME="
+command_background="yes"
+
+depend() {
+	use logger
+}
diff --git a/dev-vcs/git/git-2.34.0.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.34.0.ebuild
rename to dev-vcs/git/git-2.34.1-r1.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-2.34.0.ebuild
+++ b/dev-vcs/git/git-2.34.1-r1.ebuild
@@ -513,7 +513,7 @@ src_install() {
 	fi
 
 	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
 			"git-daemon@.service"
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -513,7 +513,7 @@ src_install() {
 	fi
 
 	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
 			"git-daemon@.service"
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -513,7 +513,7 @@ src_install() {
 	fi
 
 	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
 			"git-daemon@.service"
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -513,7 +513,7 @@ src_install() {
 	fi
 
 	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
 			"git-daemon@.service"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 6fd30df80506..74e58d7f357a 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -513,7 +513,7 @@ src_install() {
 	fi
 
 	if ! use prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
 			"git-daemon@.service"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 03e3ea85d231..36844237369e 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index a87a77cf1130..47848c430ee0 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -2,5 +2,5 @@ AUX gnuchess-6.2.8-cve-2021-30184.patch 1949 BLAKE2B e40c05ab4e2d459685ffdd6ad0d
 DIST gnuchess-6.2.8.tar.gz 804080 BLAKE2B 7079c07ae7cd2f225c428a7bf14d53eec394382508544994918b87db35d5cbdeb9cf42a11f5bc2f9c0c7b778384d6cdb9aad4490bc9cfd40a513fc2e36cbdd67 SHA512 9146ee727c1eb8002eb3b1e762d71876b512eff0799eafec7019d5312766fe2bd6655c622e66f86e92f80d2f3666e48158a1245b42c30bd3221a8b379689ecdd
 DIST gnuchess-6.2.9.tar.gz 802697 BLAKE2B e450e1d77f3158f2a063a7fc80985ad6d59f26a17a86aa9d18d86f32ee1c01fba100e59b02ea65276a1ee480ed050fbafd68635d40bae75205763fd34bfd608a SHA512 7e2ec9e14ab331ffaab2dd60da81b64b5c5a07cf14f9139d67c77886038512d15511939b8e683675ea6611e24ff2c38212a7f288540448c9225c263435f71963
 EBUILD gnuchess-6.2.8-r1.ebuild 449 BLAKE2B c63faba0c5f0cc3d413c3081f106e34bfff10149098b2dfe6b4354e06c4ef6cb7c4d7c6b8ea7ca9b3a8504974f0e6b4bf47c7b79ef4aaf9c9c8ff95e5c7d93c6 SHA512 1151666bea8557c12304a39dcd44b617a3c0d73aa3cec0fc29bc8ad61ad37d7fc0b974e45991fe099c20dfc73e4894b07e2746e067a24a63343b28e5278d66aa
-EBUILD gnuchess-6.2.9.ebuild 390 BLAKE2B 2e9c9eafdbe40e69d5fdb5386e602ca2930e87b6e36f24cfd4f8c23f4bddc8e7b568dcfbe6be072e7d497a2caa16d153571aa8f0a80ca08beeacaa2949b756b9 SHA512 3697e94f852ff0bbd3825450e1c8ded23d75f92a530233554877cdd9ff1bf661ef877cae3c470c2b192be7080f27fb93c0df2f0e95958d08bf30f33e993ea531
+EBUILD gnuchess-6.2.9.ebuild 388 BLAKE2B 0e5b4c7c884d1faa5ea727512d80d24bd24ae44cc1ad63f647368f44c96c8501a389e4b7ac0f7d7c4361994da9a14ccbc73d83a331c236b95bf9ecb51a62e131 SHA512 81f77d627ded9d2b87aee14ec2bb588ad758a5db9c267b52eae184cf23d264dcf33f5f3108a18ae6005d0de13d42f9d0f0de150ef5913a9d4ba70b061f1cc4a0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-board/gnuchess/gnuchess-6.2.9.ebuild b/games-board/gnuchess/gnuchess-6.2.9.ebuild
index 83b2bb55a3d0..886f173195d4 100644
--- a/games-board/gnuchess/gnuchess-6.2.9.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 src_configure() {
 	# bug #491088
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 923bf769c066..db9cc70c02d7 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
index a77bf174d237..636c75d23bee 100644
--- a/games-engines/openmw/Manifest
+++ b/games-engines/openmw/Manifest
@@ -1,17 +1,6 @@
-AUX openmw-0.46.0-boost-1.77.patch 227 BLAKE2B 8b2a5c11818d5d5cb8165124ec4f902b8deb8343abc60612a78fe7efe3e14fc67a383d11575fb65366578ff9af20ad307b166114cbcfbd0f3259fb1f69bd77a9 SHA512 b8ab47eb18ee189511f802ac5db2b45dd195289b04a02bffea1c3dbc36f55e4859e22828e715ef983d52d7fc2e1946432899880c4d8994d7421c561d2d958e5f
-AUX openmw-0.46.0-fix-cast.patch 12792 BLAKE2B 583ca033350e16116de85ba3bfc121bc2a444686a4e7c75388880835e708e0860c787ee6504b6f907b6749afd23acaea87b84aeece5553a2e61562142d223257 SHA512 7784c327cb442e20afb0409f0f5ef2791fa9dbe3c15b6a8e60baabec7a1179778577ac60e5c14e9e83868c15db1aaffa145006ce4d0140f0db4869c6eb0f8b9a
-AUX openmw-0.46.0-floattest2.patch 8586 BLAKE2B b419473aa1f00b327654b0f3862819f296d8390ce9a290ebd98fcf39175d85045ad85bf1ca9521a6f033f836a7331e1511e3005f2ac2f15b43c45b22641d281f SHA512 286e9fa560f62f5a291c622a7939c57e8c674ba1a4762c6a20a8fefe0b91092ffd7a1663dd70f4cc287833de0a8177329bb58e1e87b3cc9ed0d22a4a4cd71c9d
-AUX openmw-0.46.0-gcc11.patch 1061 BLAKE2B 897b6c68962196a1446b68e1bd0fa08d5ffd60d1fe15c809e3fcb0ef9dce98e2e5177c2379db151d32c1b5b52cd0c28e51d3c37c49e68bd0099202bc1ced7ca3 SHA512 9687370fd4583d1cc1199798ce8644ac86db7d591df157efb1d1361e176ce71814d7ab27d334cb432af3f7ab8750a2bb7d27e159a696803bbc9c2f67adb65098
-AUX openmw-0.46.0-missing-include.patch 682 BLAKE2B fa80b94d9ce91e1b05b96c02e80f32f1e9066ba6f8ada4a1e5150cf3a278d3a233eda42269b3027c56aaa7be98dd33cbcc3932d1e0930a51bd6b5744a73d6b6e SHA512 d0d47fe249e8fb366e00e272dc62853f8a2aaa75d45d83d270891e76674c1382fd3405e674e3b6c383bbc17125c4471893e77251744deae4d17bc373d847a638
-AUX openmw-0.46.0-mygui-license.patch 742 BLAKE2B a36016cf4b29c31918376dd27082f42cdaeacd5e8fff5a2860b827ce3db6b7fd711b2c6b8453b3792d506ec31749fb457d11225c64ff792257e30c796013501b SHA512 43895daa22eaf5891d789abed22e6d9df3c6817a7060bee7407963dbd13413dcd8fce03f236b3d7e0d589d925e9cbfe5125c72b1b2735479bf56d122cad85383
-AUX openmw-0.46.0-nifbullet-test.patch 12675 BLAKE2B fadb3c75bd0fcf4f351f30c86cdc3b407f4f7e97c3c9c278f3e20197a5c78c5b9ff320c9a53bd04fd40114f3b851f9523dd390c75487832cee67b3de7ef228d6 SHA512 e63d5f1e3e3c03a94ff2e926b2ce54d611c12a29749eba8d3c20c4d1ba1ee437142e40b20c08d2da714d7e98d573f4b1e5eaa99425b6dd27aace0e1852bb0ccb
-AUX openmw-0.46.0-recastnavigation.patch 988 BLAKE2B 3d9dd71a02070268fe21006fda20f2617ad57ce11782c5d05d3deb0c51ae2e2c91f679b23da92b6b939479fe176e99d63705ab1a3bb9d20cc7c39ab55fff2ac3 SHA512 49591f413ff68fbb11b7742c44d138f234e69478eae3462a5a402ac626bf67283e18a05dd2e2cea33706cdeb54deaf28e8a788e91491ddfe0ce10ffd978fc4e0
 AUX openmw-0.47.0-mygui-license.patch 728 BLAKE2B 036156d52e609fcbce3b219174e9def640457bcc8ce9df842e4423e8fe9634f7069a820602710fe4315d06801159aff53520843f92155865d294234f4712fed7 SHA512 fb156f963aa103fc04b515faec0ef536e47da78da9ee5fbc2cc4ccaa51d382a229d3ee8a07b007d34442200834a9aba41489cea85e90c73f9acc6943e2274079
 AUX openmw-0.47.0-sigstksz.patch 1409 BLAKE2B f023d8fa0a0e9dd31c0621bad330ed9620983ceac6eed026b5a7f4790a183d222e34e1e91a3e74bad706040ed2e61079650ae4333261095b0e53d3d475dc51cb SHA512 396c47070ed609bae2c8e09d6bc51c45c9fa6158cd8450cf7110f133d07fdc2e82d736b93e4342a982a8cb80080fcc2e005cd4239a246997526d4a114255b974
-DIST openmw-0.46.0-floattest.patch 43168 BLAKE2B 060b529fd4cd01f0fc723bb5a00a256b9c1ae4413c7b22581467cce75416e01041c3af22f0215ad9b1c475965a988065e0860c01c1e71d97454b022eec4779ea SHA512 0e165417e9ae047231fdc27b62251b33867f3782c1753f81705c886d6d3a433c8bbc3b4653a2555bc644bad11db9769d4bc2abcc84ca3ab23fabb6b80347bc32
-DIST openmw-0.46.0.tar.gz 5155004 BLAKE2B 8ad94a7fffe5a0739c56c778efe2ec17ef66c312a7fe5caf015cf3cad2bc17d2abe8cdc3f4134049a32fe55c4f4b3f72678d2d0ce1037fd02f6ac753b9d89b2c SHA512 da384aead300552817c0d0ce03515a5ccc95dcab4e02d4c1dd0d6c5f1b01ee01209bbaea74e2d12021e3465e49b051823bb018de39675c5a22c6892893624486
 DIST openmw-0.47.0.tar.gz 5156857 BLAKE2B 40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d SHA512 517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b
-EBUILD openmw-0.46.0-r2.ebuild 4328 BLAKE2B d8a1286c1d414f7c8cfe7f1341e15fcb1034694cdddfbf4af64aed41a35c1e946e6c95597b7e63e2b15b7aa81a16766a4973d238514e010390507e877bd7dec4 SHA512 fce808ce7de850286b0d748f367b4465098c0eeed249f551ff2d2fcd0eaf803c810da502b460aa99cb838f082bd05caf84bbb57a1e434040fe790a3b9e83c595
 EBUILD openmw-0.47.0-r1.ebuild 3603 BLAKE2B 507d92f1c81f58370c5bb73dae6e0ffe84fb3d64c7aaee0e9208ad8a454ab711f35f828d74956481929663b51b7027f5b045e957ce1116476f654260ed7b8f77 SHA512 41bee2d3055ae4c21c5bf5fe4068238570427e938ed745bce26a56c442caab3d1056fa57e4a1081aa52bf045417c850942af803a4c10a2d4dee151ac568c8dbf
 EBUILD openmw-9999.ebuild 4004 BLAKE2B ce9554f2cd1afdda34a34b0aeee704e15c3f4653d7d70ceebed54ae41dfa8cd4937ee4260d77b558dc6239dddc07d2c7d2c6bd25649c89440d047edfc68ea9d3 SHA512 3fd47b8d9f3a1cbff2a62d966153e10398ac7c2aaa52985e7119a7142f751899b6e24465cd8a06ab0e9061d424c203d71ed20f7e6fe2044509106a33a89cff24
 MISC metadata.xml 1454 BLAKE2B f0cfc77e752bbd3b7a4cd1bee5d7e76aa913e402525928980f728273807be80555fb03e8b9891d28fea8b941c3e632395322536f006b94dea5a00d74bced610b SHA512 9aa67b87fd886d8c3fe29f5eb3f5fbd943a7d690c1dca21a34746a286d0b193e36ec8c96b75554ca3f98c4d149dcd7e072aa702b09c6670d63739a3c8b766df3
diff --git a/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch b/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
deleted file mode 100644
index 708fd9e9f52f..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-boost-1.77.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://bugs.gentoo.org/808763
-
---- a/components/vfs/filesystemarchive.cpp
-+++ b/components/vfs/filesystemarchive.cpp
-@@ -1,4 +1,5 @@
- #include "filesystemarchive.hpp"
- 
-+#include <algorithm>
- #include <boost/filesystem.hpp>
- 
diff --git a/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch b/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
deleted file mode 100644
index f6e82cb3a2c9..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-fix-cast.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
-
-From 208a50340db5506dded60c05272ce9692773baa9 Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Mon, 13 Apr 2020 20:45:07 +0200
-Subject: [PATCH] Specialize DetourNavigator::ObjectId ctor for pointers
-
-To fix msvc error:
-components\detournavigator\objectid.hpp(14,13): error C2440: 'reinterpret_cast': cannot convert from 'const T' to 'size_t'
-          with
-          [
-              T=unsigned long
-          ]
-diff --git a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
-index 5275d9119e..e44ae48786 100644
---- a/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
-+++ b/apps/openmw_test_suite/detournavigator/tilecachedrecastmeshmanager.cpp
-@@ -61,15 +61,15 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        EXPECT_TRUE(manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
-+        EXPECT_TRUE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
-     }
- 
-     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, add_object_for_existing_object_should_return_false)
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
--        EXPECT_FALSE(manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        EXPECT_FALSE(manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground));
-     }
- 
-     TEST_F(DetourNavigatorTileCachedRecastMeshManagerTest, update_object_for_changed_object_should_return_changed_tiles)
-@@ -77,9 +77,9 @@ namespace
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
-         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
--        manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
-         EXPECT_THAT(
--            manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
-+            manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
-             ElementsAre(TilePosition(-1, -1), TilePosition(-1, 0), TilePosition(0, -1), TilePosition(0, 0),
-                         TilePosition(1, -1), TilePosition(1, 0))
-         );
-@@ -89,9 +89,9 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(
--            manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
-+            manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground),
-             std::vector<TilePosition>()
-         );
-     }
-@@ -100,7 +100,7 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-@@ -111,7 +111,7 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
-     }
- 
-@@ -121,13 +121,13 @@ namespace
-         const btBoxShape boxShape(btVector3(20, 20, 100));
-         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
- 
--        manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
-         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(1, 0)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(1, -1)), nullptr);
- 
--        manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-@@ -140,11 +140,11 @@ namespace
-         const btBoxShape boxShape(btVector3(20, 20, 100));
-         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
- 
--        manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
-         EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
- 
--        manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getMesh(TilePosition(1, 0)), nullptr);
-         EXPECT_EQ(manager.getMesh(TilePosition(1, -1)), nullptr);
-     }
-@@ -153,8 +153,8 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
--        manager.removeObject(ObjectId(1ul));
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.removeObject(ObjectId(&boxShape));
-         EXPECT_EQ(manager.getMesh(TilePosition(-1, -1)), nullptr);
-         EXPECT_EQ(manager.getMesh(TilePosition(-1, 0)), nullptr);
-         EXPECT_EQ(manager.getMesh(TilePosition(0, -1)), nullptr);
-@@ -166,13 +166,13 @@ namespace
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
- 
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(0, 0)), nullptr);
- 
--        manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, -1)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(-1, 0)), nullptr);
-         EXPECT_NE(manager.getMesh(TilePosition(0, -1)), nullptr);
-@@ -184,7 +184,7 @@ namespace
-         TileCachedRecastMeshManager manager(mSettings);
-         const auto initialRevision = manager.getRevision();
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getRevision(), initialRevision + 1);
-     }
- 
-@@ -192,9 +192,9 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         const auto beforeAddRevision = manager.getRevision();
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getRevision(), beforeAddRevision);
-     }
- 
-@@ -203,9 +203,9 @@ namespace
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
-         const btTransform transform(btMatrix3x3::getIdentity(), btVector3(getTileSize(mSettings) / mSettings.mRecastScaleFactor, 0, 0));
--        manager.addObject(ObjectId(1ul), boxShape, transform, AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, transform, AreaType::AreaType_ground);
-         const auto beforeUpdateRevision = manager.getRevision();
--        manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision + 1);
-     }
- 
-@@ -213,9 +213,9 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         const auto beforeUpdateRevision = manager.getRevision();
--        manager.updateObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.updateObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         EXPECT_EQ(manager.getRevision(), beforeUpdateRevision);
-     }
- 
-@@ -223,9 +223,9 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const btBoxShape boxShape(btVector3(20, 20, 100));
--        manager.addObject(ObjectId(1ul), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-+        manager.addObject(ObjectId(&boxShape), boxShape, btTransform::getIdentity(), AreaType::AreaType_ground);
-         const auto beforeRemoveRevision = manager.getRevision();
--        manager.removeObject(ObjectId(1ul));
-+        manager.removeObject(ObjectId(&boxShape));
-         EXPECT_EQ(manager.getRevision(), beforeRemoveRevision + 1);
-     }
- 
-@@ -233,7 +233,7 @@ namespace
-     {
-         TileCachedRecastMeshManager manager(mSettings);
-         const auto beforeRemoveRevision = manager.getRevision();
--        manager.removeObject(ObjectId(1ul));
-+        manager.removeObject(ObjectId(&manager));
-         EXPECT_EQ(manager.getRevision(), beforeRemoveRevision);
-     }
- }
-diff --git a/components/detournavigator/objectid.hpp b/components/detournavigator/objectid.hpp
-index 3b56924b13..6ddcc9169d 100644
---- a/components/detournavigator/objectid.hpp
-+++ b/components/detournavigator/objectid.hpp
-@@ -10,7 +10,7 @@ namespace DetourNavigator
-     {
-     public:
-         template <class T>
--        explicit ObjectId(const T value) throw()
-+        explicit ObjectId(T* value) throw()
-             : mValue(reinterpret_cast<std::size_t>(value))
-         {
-         }
diff --git a/games-engines/openmw/files/openmw-0.46.0-floattest2.patch b/games-engines/openmw/files/openmw-0.46.0-floattest2.patch
deleted file mode 100644
index ca6e355eab7d..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-floattest2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-https://gitlab.com/OpenMW/openmw/-/merge_requests/253
-
---- a/apps/openmw_test_suite/detournavigator/navigator.cpp	2020-06-30 16:07:31.544410916 +0100
-+++ b/apps/openmw_test_suite/detournavigator/navigator.cpp	2020-06-30 16:08:50.405698937 +0100
-@@ -458,25 +458,25 @@
- 
-         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim, mAreaCosts, mOut), Status::Success);
- 
--        EXPECT_EQ(mPath, std::deque<osg::Vec3f>({
--            osg::Vec3f(0, 215, 185.33331298828125),
--            osg::Vec3f(0, 186.6666717529296875, 185.33331298828125),
--            osg::Vec3f(0, 158.333343505859375, 185.33331298828125),
--            osg::Vec3f(0, 130.0000152587890625, 185.33331298828125),
--            osg::Vec3f(0, 101.66667938232421875, 185.33331298828125),
--            osg::Vec3f(0, 73.333343505859375, 185.33331298828125),
--            osg::Vec3f(0, 45.0000152587890625, 185.33331298828125),
--            osg::Vec3f(0, 16.6666812896728515625, 185.33331298828125),
--            osg::Vec3f(0, -11.66664981842041015625, 185.33331298828125),
--            osg::Vec3f(0, -39.999980926513671875, 185.33331298828125),
--            osg::Vec3f(0, -68.33331298828125, 185.33331298828125),
--            osg::Vec3f(0, -96.66664886474609375, 185.33331298828125),
--            osg::Vec3f(0, -124.99997711181640625, 185.33331298828125),
--            osg::Vec3f(0, -153.33331298828125, 185.33331298828125),
--            osg::Vec3f(0, -181.6666412353515625, 185.33331298828125),
--            osg::Vec3f(0, -209.999969482421875, 185.33331298828125),
--            osg::Vec3f(0, -215, 185.33331298828125),
--        })) << mPath;
-+        EXPECT_THAT(mPath, ElementsAre(
-+            Vec3fEq(0, 215, 185.33331298828125),
-+            Vec3fEq(0, 186.6666717529296875, 185.33331298828125),
-+            Vec3fEq(0, 158.333343505859375, 185.33331298828125),
-+            Vec3fEq(0, 130.0000152587890625, 185.33331298828125),
-+            Vec3fEq(0, 101.66667938232421875, 185.33331298828125),
-+            Vec3fEq(0, 73.333343505859375, 185.33331298828125),
-+            Vec3fEq(0, 45.0000152587890625, 185.33331298828125),
-+            Vec3fEq(0, 16.6666812896728515625, 185.33331298828125),
-+            Vec3fEq(0, -11.66664981842041015625, 185.33331298828125),
-+            Vec3fEq(0, -39.999980926513671875, 185.33331298828125),
-+            Vec3fEq(0, -68.33331298828125, 185.33331298828125),
-+            Vec3fEq(0, -96.66664886474609375, 185.33331298828125),
-+            Vec3fEq(0, -124.99997711181640625, 185.33331298828125),
-+            Vec3fEq(0, -153.33331298828125, 185.33331298828125),
-+            Vec3fEq(0, -181.6666412353515625, 185.33331298828125),
-+            Vec3fEq(0, -209.999969482421875, 185.33331298828125),
-+            Vec3fEq(0, -215, 185.33331298828125)
-+        ));
-     }
- 
-     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_swim_and_walk_flags)
-@@ -505,25 +505,25 @@
-         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
-                   Status::Success);
- 
--        EXPECT_EQ(mPath, std::deque<osg::Vec3f>({
--            osg::Vec3f(0, 215, -94.75363922119140625),
--            osg::Vec3f(0, 186.6666717529296875, -106.0000152587890625),
--            osg::Vec3f(0, 158.333343505859375, -115.85507965087890625),
--            osg::Vec3f(0, 130.0000152587890625, -125.71016693115234375),
--            osg::Vec3f(0, 101.66667938232421875, -135.5652313232421875),
--            osg::Vec3f(0, 73.333343505859375, -143.3333587646484375),
--            osg::Vec3f(0, 45.0000152587890625, -143.3333587646484375),
--            osg::Vec3f(0, 16.6666812896728515625, -143.3333587646484375),
--            osg::Vec3f(0, -11.66664981842041015625, -143.3333587646484375),
--            osg::Vec3f(0, -39.999980926513671875, -143.3333587646484375),
--            osg::Vec3f(0, -68.33331298828125, -143.3333587646484375),
--            osg::Vec3f(0, -96.66664886474609375, -137.3043670654296875),
--            osg::Vec3f(0, -124.99997711181640625, -127.44930267333984375),
--            osg::Vec3f(0, -153.33331298828125, -117.59423065185546875),
--            osg::Vec3f(0, -181.6666412353515625, -107.73915863037109375),
--            osg::Vec3f(0, -209.999969482421875, -97.7971343994140625),
--            osg::Vec3f(0, -215, -94.75363922119140625),
--        })) << mPath;
-+        EXPECT_THAT(mPath, ElementsAre(
-+            Vec3fEq(0, 215, -94.75363922119140625),
-+            Vec3fEq(0, 186.6666717529296875, -106.0000152587890625),
-+            Vec3fEq(0, 158.333343505859375, -115.85507965087890625),
-+            Vec3fEq(0, 130.0000152587890625, -125.71016693115234375),
-+            Vec3fEq(0, 101.66667938232421875, -135.5652313232421875),
-+            Vec3fEq(0, 73.333343505859375, -143.3333587646484375),
-+            Vec3fEq(0, 45.0000152587890625, -143.3333587646484375),
-+            Vec3fEq(0, 16.6666812896728515625, -143.3333587646484375),
-+            Vec3fEq(0, -11.66664981842041015625, -143.3333587646484375),
-+            Vec3fEq(0, -39.999980926513671875, -143.3333587646484375),
-+            Vec3fEq(0, -68.33331298828125, -143.3333587646484375),
-+            Vec3fEq(0, -96.66664886474609375, -137.3043670654296875),
-+            Vec3fEq(0, -124.99997711181640625, -127.44930267333984375),
-+            Vec3fEq(0, -153.33331298828125, -117.59423065185546875),
-+            Vec3fEq(0, -181.6666412353515625, -107.73915863037109375),
-+            Vec3fEq(0, -209.999969482421875, -97.7971343994140625),
-+            Vec3fEq(0, -215, -94.75363922119140625)
-+        ));
-     }
- 
-     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_water_when_ground_cross_water_with_max_int_cells_size_and_swim_and_walk_flags)
-@@ -552,25 +552,25 @@
-         EXPECT_EQ(mNavigator->findPath(mAgentHalfExtents, mStepSize, mStart, mEnd, Flag_swim | Flag_walk, mAreaCosts, mOut),
-                   Status::Success);
- 
--        EXPECT_EQ(mPath, std::deque<osg::Vec3f>({
--            osg::Vec3f(0, 215, -94.75363922119140625),
--            osg::Vec3f(0, 186.6666717529296875, -106.0000152587890625),
--            osg::Vec3f(0, 158.333343505859375, -115.85507965087890625),
--            osg::Vec3f(0, 130.0000152587890625, -125.71016693115234375),
--            osg::Vec3f(0, 101.66667938232421875, -135.5652313232421875),
--            osg::Vec3f(0, 73.333343505859375, -143.3333587646484375),
--            osg::Vec3f(0, 45.0000152587890625, -143.3333587646484375),
--            osg::Vec3f(0, 16.6666812896728515625, -143.3333587646484375),
--            osg::Vec3f(0, -11.66664981842041015625, -143.3333587646484375),
--            osg::Vec3f(0, -39.999980926513671875, -143.3333587646484375),
--            osg::Vec3f(0, -68.33331298828125, -143.3333587646484375),
--            osg::Vec3f(0, -96.66664886474609375, -137.3043670654296875),
--            osg::Vec3f(0, -124.99997711181640625, -127.44930267333984375),
--            osg::Vec3f(0, -153.33331298828125, -117.59423065185546875),
--            osg::Vec3f(0, -181.6666412353515625, -107.73915863037109375),
--            osg::Vec3f(0, -209.999969482421875, -97.7971343994140625),
--            osg::Vec3f(0, -215, -94.75363922119140625),
--        })) << mPath;
-+        EXPECT_THAT(mPath, ElementsAre(
-+           Vec3fEq(0, 215, -94.75363922119140625),
-+           Vec3fEq(0, 186.6666717529296875, -106.0000152587890625),
-+           Vec3fEq(0, 158.333343505859375, -115.85507965087890625),
-+           Vec3fEq(0, 130.0000152587890625, -125.71016693115234375),
-+           Vec3fEq(0, 101.66667938232421875, -135.5652313232421875),
-+           Vec3fEq(0, 73.333343505859375, -143.3333587646484375),
-+           Vec3fEq(0, 45.0000152587890625, -143.3333587646484375),
-+           Vec3fEq(0, 16.6666812896728515625, -143.3333587646484375),
-+           Vec3fEq(0, -11.66664981842041015625, -143.3333587646484375),
-+           Vec3fEq(0, -39.999980926513671875, -143.3333587646484375),
-+           Vec3fEq(0, -68.33331298828125, -143.3333587646484375),
-+           Vec3fEq(0, -96.66664886474609375, -137.3043670654296875),
-+           Vec3fEq(0, -124.99997711181640625, -127.44930267333984375),
-+           Vec3fEq(0, -153.33331298828125, -117.59423065185546875),
-+           Vec3fEq(0, -181.6666412353515625, -107.73915863037109375),
-+           Vec3fEq(0, -209.999969482421875, -97.7971343994140625),
-+           Vec3fEq(0, -215, -94.75363922119140625)
-+        ));
-     }
- 
-     TEST_F(DetourNavigatorNavigatorTest, path_should_be_over_ground_when_ground_cross_water_with_only_walk_flag)
diff --git a/games-engines/openmw/files/openmw-0.46.0-gcc11.patch b/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
deleted file mode 100644
index 0dc3106fb3bf..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-gcc11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/components/sceneutil/mwshadowtechnique.cpp b/components/sceneutil/mwshadowtechnique.cpp
-index cb3a1b2..62cfeec 100644
---- a/components/sceneutil/mwshadowtechnique.cpp
-+++ b/components/sceneutil/mwshadowtechnique.cpp
-@@ -24,6 +24,7 @@
- #include <osg/io_utils>
- 
- #include <sstream>
-+#include <limits>
- 
- namespace {
- 
-diff --git a/components/sceneutil/shadow.cpp b/components/sceneutil/shadow.cpp
-index 035c19a..aba1b81 100644
---- a/components/sceneutil/shadow.cpp
-+++ b/components/sceneutil/shadow.cpp
-@@ -4,6 +4,7 @@
- 
- #include <components/sceneutil/vismask.hpp>
- #include <components/settings/settings.hpp>
-+#include <limits>
- 
- namespace SceneUtil
- {
-diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
-index f998b78..e0e47dd 100644
---- a/components/terrain/quadtreeworld.cpp
-+++ b/components/terrain/quadtreeworld.cpp
-@@ -3,6 +3,7 @@
- #include <osgUtil/CullVisitor>
- 
- #include <sstream>
-+#include <limits>
- 
- #include <components/misc/constants.hpp>
- #include <components/sceneutil/mwshadowtechnique.hpp>
diff --git a/games-engines/openmw/files/openmw-0.46.0-missing-include.patch b/games-engines/openmw/files/openmw-0.46.0-missing-include.patch
deleted file mode 100644
index 803707498e43..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-missing-include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes build on ~arch system, patch from upstream, to be dropped for 0.47
-
-From 10daadefbea1f62a818c339dc7f3d69a858bc8a6 Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Thu, 30 Apr 2020 21:57:22 +0200
-Subject: [PATCH] Add missing include
-
-diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
-index 30d7976aec..155ce32963 100644
---- a/components/detournavigator/offmeshconnectionsmanager.hpp
-+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
-@@ -13,6 +13,7 @@
- 
- #include <boost/optional.hpp>
- 
-+#include <algorithm>
- #include <map>
- #include <mutex>
- #include <unordered_map>
diff --git a/games-engines/openmw/files/openmw-0.46.0-mygui-license.patch b/games-engines/openmw/files/openmw-0.46.0-mygui-license.patch
deleted file mode 100644
index a14f58bc9e79..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-mygui-license.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We don't install license files
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d69352c94..5f97c86e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -470,9 +470,6 @@ IF(NOT WIN32 AND NOT APPLE)
-     #    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Plugin_MyGUI_OpenMW_Resources.so" DESTINATION "${LIBDIR}" )
-     #ENDIF(BUILD_MYGUI_PLUGIN)
- 
--    # Install licenses
--    INSTALL(FILES "files/mygui/DejaVu Font License.txt" DESTINATION "${LICDIR}" )
--
-     # Install icon and desktop file
-     INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
-     INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
diff --git a/games-engines/openmw/files/openmw-0.46.0-nifbullet-test.patch b/games-engines/openmw/files/openmw-0.46.0-nifbullet-test.patch
deleted file mode 100644
index 315b0753589d..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-nifbullet-test.patch
+++ /dev/null
@@ -1,335 +0,0 @@
-Fixes test on i686 system, patch from upstream, to be dropped for 0.47
-
-From 14d0ca4cd3e9aa9e329590913d5f8fb55077587d Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Sun, 25 Nov 2018 11:42:26 +0300
-Subject: [PATCH 1/4] Cast float to btScalar
-
----
- .../detournavigator/recastmeshbuilder.cpp      | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp
-index d96ba2f29c..f613683571 100644
---- a/components/detournavigator/recastmeshbuilder.cpp
-+++ b/components/detournavigator/recastmeshbuilder.cpp
-@@ -163,15 +163,15 @@ namespace DetourNavigator
- 
-         transformBoundingBox(transform, aabbMin, aabbMax);
- 
--        aabbMin.setX(std::max(mBounds.mMin.x(), aabbMin.x()));
--        aabbMin.setX(std::min(mBounds.mMax.x(), aabbMin.x()));
--        aabbMin.setY(std::max(mBounds.mMin.y(), aabbMin.y()));
--        aabbMin.setY(std::min(mBounds.mMax.y(), aabbMin.y()));
--
--        aabbMax.setX(std::max(mBounds.mMin.x(), aabbMax.x()));
--        aabbMax.setX(std::min(mBounds.mMax.x(), aabbMax.x()));
--        aabbMax.setY(std::max(mBounds.mMin.y(), aabbMax.y()));
--        aabbMax.setY(std::min(mBounds.mMax.y(), aabbMax.y()));
-+        aabbMin.setX(std::max(static_cast<btScalar>(mBounds.mMin.x()), aabbMin.x()));
-+        aabbMin.setX(std::min(static_cast<btScalar>(mBounds.mMax.x()), aabbMin.x()));
-+        aabbMin.setY(std::max(static_cast<btScalar>(mBounds.mMin.y()), aabbMin.y()));
-+        aabbMin.setY(std::min(static_cast<btScalar>(mBounds.mMax.y()), aabbMin.y()));
-+
-+        aabbMax.setX(std::max(static_cast<btScalar>(mBounds.mMin.x()), aabbMax.x()));
-+        aabbMax.setX(std::min(static_cast<btScalar>(mBounds.mMax.x()), aabbMax.x()));
-+        aabbMax.setY(std::max(static_cast<btScalar>(mBounds.mMin.y()), aabbMax.y()));
-+        aabbMax.setY(std::min(static_cast<btScalar>(mBounds.mMax.y()), aabbMax.y()));
- 
-         transformBoundingBox(transform.inverse(), aabbMin, aabbMax);
- 
-
-From ef5a5ef43f9a91795339ef3ea97c505c1e9dc28d Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Sun, 25 Nov 2018 14:03:28 +0300
-Subject: [PATCH 2/4] Print not matched values with full precision
-
----
- .../detournavigator/operators.hpp             | 62 +++++++++++++++----
- 1 file changed, 51 insertions(+), 11 deletions(-)
-
-diff --git a/apps/openmw_test_suite/detournavigator/operators.hpp b/apps/openmw_test_suite/detournavigator/operators.hpp
-index a473632bab..e34d6278a7 100644
---- a/apps/openmw_test_suite/detournavigator/operators.hpp
-+++ b/apps/openmw_test_suite/detournavigator/operators.hpp
-@@ -20,22 +20,62 @@ namespace DetourNavigator
-     }
- }
- 
-+namespace
-+{
-+    template <class T>
-+    struct Wrapper {
-+        const T& mValue;
-+    };
-+
-+    template <class Range>
-+    inline testing::Message& writeRange(testing::Message& message, const Range& range)
-+    {
-+        message << "{\n";
-+        for (const auto& v : range)
-+            message << Wrapper<typename std::decay<decltype(v)>::type> {v} << ",\n";
-+        return message << "}";
-+    }
-+}
-+
- namespace testing
- {
-+    template <>
-+    inline testing::Message& Message::operator <<(const osg::Vec3f& value)
-+    {
-+        return (*this) << "osg::Vec3f(" << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.x()
-+            << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.y()
-+            << ", " << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.z()
-+            << ')';
-+    }
-+
-+    template <>
-+    inline testing::Message& Message::operator <<(const Wrapper<osg::Vec3f>& value)
-+    {
-+        return (*this) << value.mValue;
-+    }
-+
-+    template <>
-+    inline testing::Message& Message::operator <<(const Wrapper<float>& value)
-+    {
-+        return (*this) << std::setprecision(std::numeric_limits<float>::max_exponent10) << value.mValue;
-+    }
-+
-     template <>
-     inline testing::Message& Message::operator <<(const std::deque<osg::Vec3f>& value)
-     {
--        (*this) << "{\n";
--        for (const auto& v : value)
--        {
--            std::ostringstream stream;
--            stream << "osg::Vec3f("
--                   << std::setprecision(std::numeric_limits<float>::max_exponent10) << v.x() << ", "
--                   << std::setprecision(std::numeric_limits<float>::max_exponent10) << v.y() << ", "
--                   << std::setprecision(std::numeric_limits<float>::max_exponent10) << v.z() << ")";
--            (*this) << stream.str() << ",\n";
--        }
--        return (*this) << "}";
-+        return writeRange(*this, value);
-+    }
-+
-+    template <>
-+    inline testing::Message& Message::operator <<(const std::vector<osg::Vec3f>& value)
-+    {
-+        return writeRange(*this, value);
-+    }
-+
-+    template <>
-+    inline testing::Message& Message::operator <<(const std::vector<float>& value)
-+    {
-+        return writeRange(*this, value);
-     }
- }
- 
-
-From 2d7c3bae6127fc3717d5e3a8e8830215450fb47f Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Sun, 25 Nov 2018 11:46:09 +0300
-Subject: [PATCH 3/4] Support bullet with double precision
-
----
- apps/openmw/mwphysics/heightfield.cpp         | 38 ++++++++++++++++++-
- apps/openmw/mwphysics/heightfield.hpp         |  5 +++
- .../detournavigator/recastmeshbuilder.cpp     |  4 +-
- .../nifloader/testbulletnifloader.cpp         | 36 ++++++++++++++++--
- 4 files changed, 77 insertions(+), 6 deletions(-)
-
-diff --git a/apps/openmw/mwphysics/heightfield.cpp b/apps/openmw/mwphysics/heightfield.cpp
-index 52aed9c072..e1448116bf 100644
---- a/apps/openmw/mwphysics/heightfield.cpp
-+++ b/apps/openmw/mwphysics/heightfield.cpp
-@@ -7,12 +7,48 @@
- 
- #include <LinearMath/btTransform.h>
- 
-+#include <type_traits>
-+
-+namespace
-+{
-+    template <class T>
-+    auto makeHeights(const T* heights, float sqrtVerts)
-+        -> std::enable_if_t<std::is_same<btScalar, T>::value, std::vector<btScalar>>
-+    {
-+        return {};
-+    }
-+
-+    template <class T>
-+    auto makeHeights(const T* heights, float sqrtVerts)
-+        -> std::enable_if_t<!std::is_same<btScalar, T>::value, std::vector<btScalar>>
-+    {
-+        return std::vector<btScalar>(heights, heights + static_cast<std::ptrdiff_t>(sqrtVerts * sqrtVerts));
-+    }
-+
-+    template <class T>
-+    auto getHeights(const T* floatHeights, const std::vector<btScalar>&)
-+        -> std::enable_if_t<std::is_same<btScalar, T>::value, const btScalar*>
-+    {
-+        return floatHeights;
-+    }
-+
-+    template <class T>
-+    auto getHeights(const T*, const std::vector<btScalar>& btScalarHeights)
-+        -> std::enable_if_t<!std::is_same<btScalar, T>::value, const btScalar*>
-+    {
-+        return btScalarHeights.data();
-+    }
-+}
-+
- namespace MWPhysics
- {
-     HeightField::HeightField(const float* heights, int x, int y, float triSize, float sqrtVerts, float minH, float maxH, const osg::Object* holdObject)
-+        : mHeights(makeHeights(heights, sqrtVerts))
-     {
-         mShape = new btHeightfieldTerrainShape(
--            sqrtVerts, sqrtVerts, heights, 1,
-+            sqrtVerts, sqrtVerts,
-+            getHeights(heights, mHeights),
-+            1,
-             minH, maxH, 2,
-             PHY_FLOAT, false
-         );
-diff --git a/apps/openmw/mwphysics/heightfield.hpp b/apps/openmw/mwphysics/heightfield.hpp
-index f248186db3..2ba58afff8 100644
---- a/apps/openmw/mwphysics/heightfield.hpp
-+++ b/apps/openmw/mwphysics/heightfield.hpp
-@@ -3,6 +3,10 @@
- 
- #include <osg/ref_ptr>
- 
-+#include <LinearMath/btScalar.h>
-+
-+#include <vector>
-+
- class btCollisionObject;
- class btHeightfieldTerrainShape;
- 
-@@ -27,6 +31,7 @@ namespace MWPhysics
-         btHeightfieldTerrainShape* mShape;
-         btCollisionObject* mCollisionObject;
-         osg::ref_ptr<const osg::Object> mHoldObject;
-+        std::vector<btScalar> mHeights;
- 
-         void operator=(const HeightField&);
-         HeightField(const HeightField&);
-diff --git a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
-index 6c474765de..c86dee6e55 100644
---- a/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
-+++ b/apps/openmw_test_suite/detournavigator/recastmeshbuilder.cpp
-@@ -363,11 +363,11 @@ namespace
-             AreaType_ground
-         );
-         const auto recastMesh = builder.create(mGeneration, mRevision);
--        EXPECT_EQ(recastMesh->getVertices(), std::vector<float>({
-+        EXPECT_THAT(recastMesh->getVertices(), Pointwise(FloatNear(1e-5), std::vector<float>({
-             1.41421353816986083984375, 0, 1.1920928955078125e-07,
-             -1.41421353816986083984375, 0, -1.1920928955078125e-07,
-             1.1920928955078125e-07, 0, -1.41421353816986083984375,
--        }));
-+        })));
-         EXPECT_EQ(recastMesh->getIndices(), std::vector<int>({0, 1, 2}));
-         EXPECT_EQ(recastMesh->getAreaTypes(), std::vector<AreaType>({AreaType_ground}));
-     }
-diff --git a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
-index 36f2512462..6ec94fd68f 100644
---- a/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
-+++ b/apps/openmw_test_suite/nifloader/testbulletnifloader.cpp
-@@ -9,6 +9,8 @@
- #include <gtest/gtest.h>
- #include <gmock/gmock.h>
- 
-+#include <algorithm>
-+
- namespace
- {
-     template <class T>
-@@ -30,6 +32,34 @@ namespace
-         shape.processAllTriangles(&callback, aabbMin, aabbMax);
-         return result;
-     }
-+
-+    bool isNear(btScalar lhs, btScalar rhs)
-+    {
-+        return std::abs(lhs - rhs) <= 1e-5;
-+    }
-+
-+    bool isNear(const btVector3& lhs, const btVector3& rhs)
-+    {
-+        return std::equal(
-+            static_cast<const btScalar*>(lhs),
-+            static_cast<const btScalar*>(lhs) + 3,
-+            static_cast<const btScalar*>(rhs),
-+            [] (btScalar lhs, btScalar rhs) { return isNear(lhs, rhs); }
-+        );
-+    }
-+
-+    bool isNear(const btMatrix3x3& lhs, const btMatrix3x3& rhs)
-+    {
-+        for (int i = 0; i < 3; ++i)
-+            if (!isNear(lhs[i], rhs[i]))
-+                return false;
-+        return true;
-+    }
-+
-+    bool isNear(const btTransform& lhs, const btTransform& rhs)
-+    {
-+        return isNear(lhs.getOrigin(), rhs.getOrigin()) && isNear(lhs.getBasis(), rhs.getBasis());
-+    }
- }
- 
- static std::ostream& operator <<(std::ostream& stream, const btVector3& value)
-@@ -157,7 +187,7 @@ static bool operator ==(const btCompoundShape& lhs, const btCompoundShape& rhs)
-     for (int i = 0; i < lhs.getNumChildShapes(); ++i)
-     {
-         if (!compareObjects(lhs.getChildShape(i), rhs.getChildShape(i))
--                || !(lhs.getChildTransform(i) == rhs.getChildTransform(i)))
-+                || !isNear(lhs.getChildTransform(i), rhs.getChildTransform(i)))
-             return false;
-     }
-     return true;
-@@ -165,13 +195,13 @@ static bool operator ==(const btCompoundShape& lhs, const btCompoundShape& rhs)
- 
- static bool operator ==(const btBoxShape& lhs, const btBoxShape& rhs)
- {
--    return lhs.getLocalScaling() == rhs.getLocalScaling()
-+    return isNear(lhs.getLocalScaling(), rhs.getLocalScaling())
-         && lhs.getHalfExtentsWithoutMargin() == rhs.getHalfExtentsWithoutMargin();
- }
- 
- static bool operator ==(const btBvhTriangleMeshShape& lhs, const btBvhTriangleMeshShape& rhs)
- {
--    return lhs.getLocalScaling() == rhs.getLocalScaling()
-+    return isNear(lhs.getLocalScaling(), rhs.getLocalScaling())
-         && lhs.usesQuantizedAabbCompression() == rhs.usesQuantizedAabbCompression()
-         && lhs.getOwnsBvh() == rhs.getOwnsBvh()
-         && getTriangles(lhs) == getTriangles(rhs);
-
-From 66da72048a5893bc8c9b20f6f7210fd45b6a74bf Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Wed, 20 Feb 2019 23:41:16 +0300
-Subject: [PATCH 4/4] Update bullet for windows up to 2.87
-
----
- CI/before_script.msvc.sh | 12 ++++++------
- appveyor.yml             |  4 ++--
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/appveyor.yml b/appveyor.yml
-index 3057cc7257..e2c13ed948 100644
---- a/appveyor.yml
-+++ b/appveyor.yml
-@@ -30,8 +30,8 @@ configuration:
- clone_depth: 1
- 
- cache:
--    - C:\projects\openmw\deps\Bullet-2.86-msvc2015-win32.7z
--    - C:\projects\openmw\deps\Bullet-2.86-msvc2015-win64.7z
-+    - C:\projects\openmw\deps\Bullet-2.87-msvc2015-win32.7z
-+    - C:\projects\openmw\deps\Bullet-2.87-msvc2015-win64.7z
-     - C:\projects\openmw\deps\MyGUI-3.2.2-msvc2015-win32.7z
-     - C:\projects\openmw\deps\MyGUI-3.2.2-msvc2015-win64.7z
-     - C:\projects\openmw\deps\OSG-3.4.1-scrawl-msvc2015-win32.7z
diff --git a/games-engines/openmw/files/openmw-0.46.0-recastnavigation.patch b/games-engines/openmw/files/openmw-0.46.0-recastnavigation.patch
deleted file mode 100644
index ea3242d73ca8..000000000000
--- a/games-engines/openmw/files/openmw-0.46.0-recastnavigation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use system recastnavigation instead of bundled one
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d69352c94..cfb53dc5b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -596,7 +596,16 @@ endif(WIN32)
- # Extern
- set(RECASTNAVIGATION_STATIC ON CACHE BOOL "Build recastnavigation static libraries")
- 
--add_subdirectory (extern/recastnavigation EXCLUDE_FROM_ALL)
-+add_library(RecastNavigation::DebugUtils SHARED IMPORTED)
-+add_library(RecastNavigation::Detour SHARED IMPORTED)
-+add_library(RecastNavigation::Recast SHARED IMPORTED)
-+set_target_properties(RecastNavigation::DebugUtils PROPERTIES
-+	IMPORTED_LOCATION GENTOO_RECAST_LIBDIR/libDebugUtils.so)
-+set_target_properties(RecastNavigation::Detour PROPERTIES
-+	IMPORTED_LOCATION GENTOO_RECAST_LIBDIR/libDetour.so)
-+set_target_properties(RecastNavigation::Recast PROPERTIES
-+	IMPORTED_LOCATION GENTOO_RECAST_LIBDIR/libRecast.so)
-+
- add_subdirectory (extern/osg-ffmpeg-videoplayer)
- add_subdirectory (extern/oics)
- if (BUILD_OPENCS)
diff --git a/games-engines/openmw/openmw-0.46.0-r2.ebuild b/games-engines/openmw/openmw-0.46.0-r2.ebuild
deleted file mode 100644
index 24532e11f3da..000000000000
--- a/games-engines/openmw/openmw-0.46.0-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg-utils readme.gentoo-r1
-
-DESCRIPTION="Open source reimplementation of TES III: Morrowind"
-HOMEPAGE="https://openmw.org/ https://gitlab.com/OpenMW/openmw"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenMW/openmw.git"
-else
-	SRC_URI="
-		https://github.com/OpenMW/openmw/archive/${P}.tar.gz
-		https://gitlab.com/OpenMW/openmw/-/merge_requests/163.patch -> ${P}-floattest.patch
-	"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="GPL-3 MIT BitstreamVera ZLIB"
-SLOT="0"
-IUSE="doc devtools +osg-fork test +qt5"
-RESTRICT="!test? ( test )"
-
-# FIXME: Unbundle dev-games/openscenegraph-qt in extern/osgQt directory,
-# used when BUILD_OPENCS flag is enabled. See bug #676266.
-
-RDEPEND="
-	dev-games/mygui
-	dev-games/recastnavigation
-	dev-libs/boost:=[threads(+),zlib]
-	dev-libs/tinyxml:=[stl]
-	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/openal
-	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=[-double-precision]
-	virtual/opengl
-	osg-fork? ( =dev-games/openscenegraph-openmw-3.4*:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
-	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
-	qt5? (
-		app-arch/unshield
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[doc]
-		dev-python/sphinx
-	)
-	test? (
-		dev-cpp/gtest
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/openmw-0.46.0-mygui-license.patch
-	"${FILESDIR}"/openmw-0.46.0-recastnavigation.patch
-	"${FILESDIR}"/openmw-0.46.0-missing-include.patch
-	"${FILESDIR}"/openmw-0.46.0-fix-cast.patch
-	"${FILESDIR}"/openmw-0.46.0-nifbullet-test.patch
-	# https://gitlab.com/OpenMW/openmw/-/merge_requests/163
-	"${DISTDIR}"/openmw-0.46.0-floattest.patch
-	"${FILESDIR}"/openmw-0.46.0-floattest2.patch
-	"${FILESDIR}"/openmw-0.46.0-gcc11.patch
-	"${FILESDIR}"/openmw-0.46.0-boost-1.77.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Use the system tinyxml headers
-	rm -v extern/oics/tiny{str,xml}* || die
-
-	# Unbundle recastnavigation
-	rm -vr extern/recastnavigation || die
-	sed -i "s#GENTOO_RECAST_LIBDIR#${EPREFIX}/usr/$(get_libdir)#" CMakeLists.txt || die
-}
-
-src_configure() {
-	use devtools && ! use qt5 && \
-		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
-
-	append-cxxflags "-I${EPREFIX}/usr/include/recastnavigation"
-
-	local mycmakeargs=(
-		-DBUILD_BSATOOL=$(usex devtools)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_ESMTOOL=$(usex devtools)
-		-DBUILD_LAUNCHER=$(usex qt5)
-		-DBUILD_NIFTEST=$(usex devtools)
-		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
-		-DBUILD_WIZARD=$(usex qt5)
-		-DBUILD_UNITTESTS=$(usex test)
-		-DGLOBAL_DATA_PATH="${EPREFIX}/usr/share"
-		-DICONDIR="${EPREFIX}/usr/share/icons/hicolor/256x256/apps"
-		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
-		-DUSE_SYSTEM_TINYXML=ON
-		-DDESIRED_QT_VERSION=5
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_src_compile doc
-		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
-			-name '*.md5' -type f -delete || die
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
-	fi
-}
-
-src_test() {
-	"${BUILD_DIR}/openmw_test_suite" || die
-}
-
-src_install() {
-	cmake_src_install
-
-	local DOC_CONTENTS="
-	You need the original Morrowind data files. If you haven't
-	installed them yet, you can install them straight via the
-	installation wizard which is the officially supported method
-	(either by using the launcher or by calling 'openmw-wizard'
-	directly).\n"
-
-	if ! use qt5; then
-		local DOC_CONTENTS+="\n\n
-		USE flag 'qt5' is disabled, 'openmw-launcher' and
-		'openmw-wizard' are not available. You are on your own for
-		making the Morrowind data files available and pointing
-		openmw at them.\n\n
-		Additionally; you must import the Morrowind.ini file before
-		running openmw with the Morrowind data files for the first
-		time. Typically this can be done like so:\n\n
-		\t mkdir -p ~/.config/openmw\n
-		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 8eaed27ce852..859a22a08f02 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/fortune-mod-all/Manifest b/games-misc/fortune-mod-all/Manifest
index 430f70b80fb6..bdf71d7b0566 100644
--- a/games-misc/fortune-mod-all/Manifest
+++ b/games-misc/fortune-mod-all/Manifest
@@ -1,3 +1,3 @@
 EBUILD fortune-mod-all-4.ebuild 918 BLAKE2B 278e64bfb9071237ebb2efcd0857968bb854d6d37b8dbd93857bcc2c0a324f65f4a9169a0a78a532d42f7cffc12cb510823c165415e223850515215a56dd35f3 SHA512 59b255a099360b79f9fea8630444c6b14c23e21454ecf98a2a8d37e8227a00d60e98684e1ed65d8a74545cec7920be7a9ea854d21e7a9b0fe1d47a130e0316a0
-EBUILD fortune-mod-all-5.ebuild 970 BLAKE2B 23cd6a2908b0b36f83353eaa326848a6b17f2dcdb7c289948d2dffbb7c887278c264e733c8994c45e0ba8e65bfb8d381489701ae26a772d8f8be7877f7b4768b SHA512 71b6ad5d60c08f05cd3c8f883c8b61cc1dea47c98f895841b00f5bc5abd83f3983c1807855e819ece7cdd3b2fdf9ced9886e2664cf891f57344f1c7f8849ccfb
+EBUILD fortune-mod-all-5.ebuild 976 BLAKE2B d9a8736deef9e17d042f24f458e9716e33eace8438833cf2978395c151a1abd228ef54db772d79b37c495c2b8836217b40ca298c3ec6b494b8f5dd021aa79f84 SHA512 ae88dc0455f6e94d603eb5edab191d65b033712363a4642283bab2b2c4dd170642d9b89e2ad74c707028cde76728ad6ac9c10b98dfa5ab51dcf0dcb493d932eb
 MISC metadata.xml 278 BLAKE2B 7127b54a88150ba5e77706c5286930700682acfd8031806561e32fcafb54fe6c21257eb5199a9e4c7efd7bd2e84e7b8f6a5a5e222bf323e89143ff6995117352 SHA512 a81e14af9aa98d16f1d2b000e3f43425e931b9b69c8e2a7de5ed529ca2bdef203ab19937ed52439b38ac1caa9d6bf29fcffced225553a1c20131b9afecddf616
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
index 661a482eae43..aba2aa7b32c9 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="l10n_cs l10n_de l10n_it"
 
 RDEPEND=">=games-misc/fortune-mod-3.6.1-r1
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
index e3010244476f..642754186f18 100644
--- a/games-misc/fortune-mod/Manifest
+++ b/games-misc/fortune-mod/Manifest
@@ -3,5 +3,5 @@ AUX fortune-mod-1.99.1-gentoo.patch 2495 BLAKE2B 755d525da36c6d5b00ac3635082d788
 DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
 DIST fortune-mod-3.6.1.tar.xz 1419132 BLAKE2B 0ff684ee8aaf5eaabd75f187a3bff533ab4ee6e66c47c57fc700d2671006c8dff42f732fde78b40516f8ee907a52fc1965fb0ff257b12563d645f97c5ebc0031 SHA512 3f35bf35d62c46dfeaca450a127a7444bb870f6345c92afe626f81548ac375d21306c00a56d31982b8e25129acd6f829402d5afaec676e1200ad5bf586f7a8f1
 EBUILD fortune-mod-1.99.1-r3.ebuild 1717 BLAKE2B 7ec337d3a55e882d24c485e0461d8c757e34f894a65283d36e2af906dc1015cf13b27dc3aa487478a776510f984baae73852dbc2870c5e4a557d228f2b552e8b SHA512 35d6fd99e402cb26466860bc3754d6123d3e63d533afaa27f119f6d048b05c253ea5e32d160ba3172f024151762c9d281aab5b7825ae8be115fdfd54da8b1910
-EBUILD fortune-mod-3.6.1-r1.ebuild 992 BLAKE2B 5a124fc4cc3e7556a2e34904f9e9cf9ed3968c24531b6949bf330e6fa2346d69b3bf69853d761d3e72ef053a746364e8387e110ada63a4f7bef3790a27497010 SHA512 07e4475a0d7b753392a591c044c39c3e273fce6b943c842689ecf7f990997d0db8f902f77d65c5fd3d3f929e70c508cdd474fce4e5772989285d9863abba1912
+EBUILD fortune-mod-3.6.1-r1.ebuild 998 BLAKE2B dc9625552ed2492fdd3f9c7cb07bf79c87d1795cd5c530745055ecf76633d41ade32adf47830dcfb2178759a49891c72f2c5f9765ebb98474a20dcd4c7be8c3f SHA512 f542bdac95508c993d9008075ae86409289455896f843ebb3e2e2a820258c3940cfb9540f4b3426d4f7fad98d7691a93756fbfe895f26215f73ca748d1cd920a
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
index d35cc17613d7..070bc906922b 100644
--- a/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/fortune-mod/releases/download/${P}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86"
 IUSE="offensive"
 
 DEPEND="app-text/recode:=
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 1a1352e0b891..3ae71b6a5f3d 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index b68ae0c9e11d..0db6e23e358a 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
 AUX pathological-1.1.3_p16-pygame2-compat.patch 1954 BLAKE2B e1670210cdad9f957f76f20ca5bbdc2cccfef9c37353dc00ffeb10c87473972b0066d2413c42c80541bfa23059cffe5143ad2791ec816a06654f4e5dedbb8551 SHA512 e63b964849803020cb68ed908b317fea81c60b5360cbd9cf10e3836483250972764352e619afb836196b50732360fac3da88a68d3863431a9b5f8a74535a2023
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
 DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
-EBUILD pathological-1.1.3_p16-r3.ebuild 1682 BLAKE2B 82abefa183235d72c9d5036052d8090cf34491b31eaaf39f79cb4da21fdee8b41d9c3ab9137a795da344a732497c48d544bf8f8d0b872961cce361b3172dbe0d SHA512 5cebbdead906abe02c24d0d0f970488a54eea86bbd1c66794abd6a6a484f253cdfcb606e8508bf0a5a53184d1230d660a4f672f6931d432eb192d97a41f41c5f
+EBUILD pathological-1.1.3_p16-r3.ebuild 1697 BLAKE2B fc67b86410ffe646678d3f5d86731b40b66dc3d1457c9f05823b3499524d44a088f448a3952258e6ff7146878acd21b2bc25c0204a4eab0d4d0387866e3a3190 SHA512 dbe197343def9d6ce68f4afa0173a426668d262ed61e3c38d6d203a0d7c216b027182809c51aeadb1fa5ea6c1912b9bde119f182dfdfb52cd06f13ecb604e14c
 MISC metadata.xml 336 BLAKE2B 359f5565f58bfe5b62b7f7af3b062185641e53e861e0191f010d9842e1a3d77dbd0dd5eb61c68b85cb00151c47c9b8223bdfbdf1ac57ab885f812bf94c50f15e SHA512 aa01ff164bcaa993d52746a3b3bdf5913646c0822253c227133c8ed5f3bdb8636195d2ba7e3b125f00ec901d2f3182cec39fb41fcea7b0948f1641d9d2ab739c
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
index 0c32cefd318d..a16de8ecbe0d 100644
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
@@ -36,7 +36,8 @@ PATCHES=(
 src_prepare() {
 	# debian's patches add python3 support and sanitize other aspects
 	# use_ogg_music: excluded given .xm files are fine
-	local debian=($(<"${WORKDIR}"/debian/patches/series))
+	local debian
+	debian=($(<"${WORKDIR}"/debian/patches/series)) || die
 	debian=(${debian[@]/60_use_ogg_music.patch/})
 	PATCHES+=("${debian[@]/#/${WORKDIR}/debian/patches/}")
 
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index a98f8cca041a..03125ab95304 100644
Binary files a/gnustep-apps/Manifest.gz and b/gnustep-apps/Manifest.gz differ
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index f2124dde65f8..c2825426f960 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,3 +1,5 @@
+AUX gworkspace-0.9.4-ImageViewerProtocol.patch 5624 BLAKE2B fdb61a9ac90d264dfc8e35729d4b20d201cee34634188caeff41660183405c9ed6f30aa25008d9f438d89da3795f7605330003b4d4553f25899fa651c4eb0ceb SHA512 2209941ad0aa46845b50372749560a8b940169cb72685deb4d7cba005b487a31717991982f277100272b42e83bf426f127dc99667c071c6dcff8679ccd495179
 DIST gworkspace-0.9.4.tar.gz 3855909 BLAKE2B 5a636ccfb4fa79acd91bce34d3b5fe8a6d7bccc3f2f1f5a3d9f19c8a91743ec19c2eae0930e81807c6a5f098761b65f17e86a3edc44da155c50c903284ea2b20 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7
+EBUILD gworkspace-0.9.4-r1.ebuild 935 BLAKE2B cdcb31c463bdb004f94ca69577d4627737883e017e66fdbe4691b8bedbcfc107282058d1f779e7c775df6a64c2ea61a6dfb48bf4e28ae4effb99d80a29cbdc60 SHA512 8e99501f13dc6d1905d9ca7e41ad5e0f03aeb6c3a0eb5c9cdfb955f73842ab5bfcc76d396bcbfcb4bbee61630d568c833bec7a143ab725cca427a6e0ee9d29f8
 EBUILD gworkspace-0.9.4.ebuild 877 BLAKE2B c7d08f264f2984e9a439332ae869d2d3a712d206139cd609f45d72c28d51ffad872746a1d82dba9aeb581b9f19d6b8268e79e6f2ab22a740465534dd63341a7d SHA512 b1b2fa6096b78e3dc1713da29966e720a37927d45766130a90be609112b973a1a57b74b9bb4089f7df9f56279be7a5a7de906fac5139efb38e95783251a8319e
 MISC metadata.xml 580 BLAKE2B 69183b63130865b14df3c4a8cffa3278e81b9daef6f5495489cd1d80bf3ee06ee38daca9acdd9c0bbb20e9242f175a69b00b5bf5a542c2ea7c90ddf974645cf1 SHA512 4dd48119a2940260a326a78e2d860b98b10575d4e55772647c46beaca04581bf46ffc8ed1342458a6c1bcb2a35f5ced435997a0cd5f677c79fd154e83b64a5e4
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch b/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch
new file mode 100644
index 000000000000..d2bfd54e60bf
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch
@@ -0,0 +1,186 @@
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.h gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.h	2016-06-07 18:13:08.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.h	2021-12-06 14:18:12.024085590 +0100
+@@ -1,8 +1,9 @@
+ /* ImageViewer.h
+  *  
+- * Copyright (C) 2004-2016 Free Software Foundation, Inc.
++ * Copyright (C) 2004-2020 Free Software Foundation, Inc.
+  *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ *          Riccardo Mottola <rm@gnu.org>
+  * Date: January 2004
+  *
+  * This file is part of the GNUstep Inspector application
+@@ -36,6 +37,7 @@
+ @class NSWorkspace;
+ @class ProgressView;
+ @class ImageResizer;
++
+ @protocol ContentInspectorProtocol
+ 
+ - (void)contentsReadyAt:(NSString *)path;
+@@ -51,7 +53,7 @@
+ 
+ @end
+ 
+-@interface ImageViewer : NSView <ContentViewersProtocol>
++@interface ImageViewer : NSView <ContentViewersProtocol, ImageViewerProtocol>
+ {
+   NSArray *extsarr;
+   BOOL valid;	
+@@ -76,9 +78,9 @@
+   NSWorkspace *ws;
+ }
+ 
+-- (void)setResizer:(id)anObject;
++- (oneway void)setResizer:(id)anObject;
+ 
+-- (void)imageReady:(NSDictionary *)imginfo;
++- (oneway void)imageReady:(NSDictionary *)imginfo;
+ 
+ - (void)editFile:(id)sender;
+ 
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.m gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.m
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.m	2016-06-07 18:13:08.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.m	2021-12-06 14:18:12.024085590 +0100
+@@ -198,7 +198,7 @@
+   }
+ }
+ 
+-- (void)setResizer:(id)anObject
++- (oneway void)setResizer:(id)anObject
+ {
+     NSSize imsize = [imview bounds].size;
+ 
+@@ -207,6 +207,7 @@
+     [anObject setProtocolForProxy: @protocol(ImageResizerProtocol)];
+     resizer = (ImageResizer *)anObject;
+     RETAIN (resizer);
++    [resizer setProxy: self];
+     [self addSubview: progView]; 
+     [progView start];    
+     [resizer readImageAtPath: imagePath setSize: imsize];
+@@ -214,7 +215,7 @@
+ 
+ 
+ 
+-- (void)imageReady:(NSDictionary *)imginfo
++- (oneway void)imageReady:(NSDictionary *)imginfo
+ {
+   NSData *imgdata;
+   BOOL imgok;
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.h gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.h	2016-06-01 18:35:46.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.h	2021-12-06 14:18:12.024085590 +0100
+@@ -1,9 +1,10 @@
+ /* Resizer.m
+ h
+  *  
+- * Copyright (C) 2005-2016 Free Software Foundation, Inc.
++ * Copyright (C) 2005-2020 Free Software Foundation, Inc.
+  *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ *          Riccardo Mottola <rm@gnu.org>
+  * Date: May 2016
+  *
+  * This file is part of the GNUstep Inspector application
+@@ -23,14 +24,15 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+  */
+ 
+-
+-NSConnection *serverConnection;
++#import "ContentViewersProtocol.h"
+ 
+ @interface ImageResizer : NSObject
+ {
+-
++  id <ImageViewerProtocol> imageViewerProxy;
+ }
+ 
++- (void)setProxy:(id <ImageViewerProtocol>)ivp;
++
+ - (void)readImageAtPath:(NSString *)path
+                 setSize:(NSSize)imsize;
+ 
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.m gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.m
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.m	2016-06-07 17:28:36.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.m	2021-12-06 14:18:45.928073537 +0100
+@@ -33,24 +33,13 @@
+   do { if (GW_DEBUG_LOG) \
+     NSLog(format , ## args); } while (0)
+ 
+-@protocol ImageViewerProtocol
+-
+-- (oneway void)setResizer:(id)anObject;
+-
+-- (oneway void)imageReady:(NSDictionary *)dict;
+-
+-@end
+-
+-
+-
+-
+-
+ @implementation ImageResizer
+ 
+ + (void)connectWithPorts:(NSArray *)portArray
+ {
+   NSAutoreleasePool *pool;
+   ImageResizer *serverObject;
++  NSConnection *serverConnection;
+ 
+   pool = [[NSAutoreleasePool alloc] init];
+ 
+@@ -77,6 +66,11 @@
+ 
+ #define MIX_LIM 16
+ 
++- (void)setProxy:(id <ImageViewerProtocol>)ivp
++{
++  imageViewerProxy = ivp;
++}
++
+ - (void)readImageAtPath:(NSString *)path
+                 setSize:(NSSize)imsize
+ {
+@@ -191,7 +185,7 @@
+     
+     RELEASE (srcImage);
+   }
+-  [(id <ImageViewerProtocol>)[serverConnection rootProxy] imageReady: info];
++  [imageViewerProxy imageReady: info];
+   RELEASE (arp);
+ }
+ 
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewersProtocol.h gworkspace-0.9.4/Inspector/ContentViewersProtocol.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewersProtocol.h	2010-06-16 19:45:53.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewersProtocol.h	2021-12-06 14:18:12.025085590 +0100
+@@ -1,8 +1,9 @@
+ /* ContentViewersProtocol.h
+  *  
+- * Copyright (C) 2004 Free Software Foundation, Inc.
++ * Copyright (C) 2004-2020 Free Software Foundation, Inc.
+  *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ *          Riccardo Mottola <rm@gnu.org>
+  * Date: January 2004
+  *
+  * This file is part of the GNUstep GWorkspace application
+@@ -48,4 +49,12 @@
+ 
+ @end 
+ 
++/* Proxy for DO connection */
+ 
++@protocol ImageViewerProtocol
++
++- (oneway void)setResizer:(id)anObject;
++
++- (oneway void)imageReady:(NSDictionary *)dict;
++
++@end
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..774ee0d4ccf5
--- /dev/null
+++ b/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+DESCRIPTION="A workspace manager for GNUstep"
+HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+gwmetadata"
+
+DEPEND=">=gnustep-base/gnustep-gui-0.25.0
+	gwmetadata? (
+		>=gnustep-apps/systempreferences-1.0.1_p24791
+		>=dev-db/sqlite-3.2.8
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ImageViewerProtocol.patch )
+
+src_configure() {
+	local myconf=""
+	use kernel_linux && myconf="${myconf} --with-inotify"
+	use gwmetadata && myconf="${myconf} --enable-gwmetadata"
+
+	egnustep_env
+	econf ${myconf}
+}
+
+src_install() {
+	egnustep_env
+	egnustep_install
+
+	if use doc;
+	then
+		dodir /usr/share/doc/${PF}
+		cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
+	fi
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 315b58de68fc..b83b7c572088 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/libwpe/Manifest b/gui-libs/libwpe/Manifest
index 1c4100e9509f..6198f169752e 100644
--- a/gui-libs/libwpe/Manifest
+++ b/gui-libs/libwpe/Manifest
@@ -1,3 +1,3 @@
 DIST libwpe-1.10.1.tar.xz 51984 BLAKE2B 8afb81e85d134a525a9f7cf0156632ea72a72ab94fcb06c411a11d5304b510cb711a1f2f948cb448bf1ac54c4734cce7a2eaa1ca34c2207c6155d4ab5c350139 SHA512 be1f366ae0d23326ceaab0fe4cdbaea4b50ab822c0e9e7315120fa665113d5eea43f5a23c8e5068f041322d3139cd4de75cfb0f03613cb40586fece1467afbca
-EBUILD libwpe-1.10.1-r1.ebuild 584 BLAKE2B f1083287ab88034c1917ea862005e0bf08b1ffecec20297419dba47b472cdc88a2c85792cb80eae132c51b04529bca32e4c652997f31ed82f3ab6aab0831176b SHA512 d30e9de8bd2e589cb8b3690ef3e29a6c8ba05aa6e9576b58a5faa2b3feabdeefc3518d854017091d86b1919d33a7deb68b0723d23cd0cfac2d53bc05d7315188
+EBUILD libwpe-1.10.1-r1.ebuild 583 BLAKE2B 2d05d7279e438bda170a63fd8e6aa01dea5c2741fcf1c2863daab6c8b4fa4708bb3814b86d957b8922a7d9dd4a9b0e8da4e56a20529990c610b0e029a9962cb6 SHA512 428054f716eb05587719a11710089f36491001c8decec67ccfd4047fd6096faae45ce182e3e2891ab7f4e356e88db97cfbf57a1d4bf568531f1d376bc499358b
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/libwpe/libwpe-1.10.1-r1.ebuild b/gui-libs/libwpe/libwpe-1.10.1-r1.ebuild
index be2aba306fc1..8eaa1e1170cb 100644
--- a/gui-libs/libwpe/libwpe-1.10.1-r1.ebuild
+++ b/gui-libs/libwpe/libwpe-1.10.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/mesa[egl(+)]
diff --git a/gui-libs/wpebackend-fdo/Manifest b/gui-libs/wpebackend-fdo/Manifest
index 40c3397ce199..344892cfa0e9 100644
--- a/gui-libs/wpebackend-fdo/Manifest
+++ b/gui-libs/wpebackend-fdo/Manifest
@@ -1,3 +1,3 @@
 DIST wpebackend-fdo-1.10.0.tar.xz 38484 BLAKE2B 6b2cb4d4b1321245dee13d33ad58ee8d31aa4f5a25cfc2cde2bc2a67db15e9835de59f1b0550b7a205502b2e201398cf8032a0f235ae01f74e4568874cb47620 SHA512 50e65d1560b943ec85b80449c838b61d7ab3baf96844542cce06028bd934b1145319f3fa07a3dc629d2a7896b95ab388edbe853b7e377cf0ff02fb66291e1ce0
-EBUILD wpebackend-fdo-1.10.0.ebuild 661 BLAKE2B 985ccacc6b85aa9c1c41e1ca324d8f3b7f43d54782625d6abc2c5b33bfe2c3e3e4628b43f1fa53d429c683fa9eb2f9cf1dd43b69b4166b16995a3e7bc72d4aa5 SHA512 81c33fee1d483702daa7bd68c64585bb4fdcaa8bc2754f224aab2e24a02f70aa02397f424b7644f73d7e623484818fd1e1699dd4aa57d2da328460a4af8aa383
+EBUILD wpebackend-fdo-1.10.0.ebuild 660 BLAKE2B 6aa40a5afc57ed108e85c9277b989541189556d51bee281f959b92c53b629f9014b12815b719bb3a506398376e50bd2324f7af739ee99b5f7d2118e05103a325 SHA512 68f17bb2410198b578b99280c7ac77511f4a47a448da508eb007462dea1182c4884d2c3096ace555d0b81343fd39920045cb7c83dfa4299ac0fe26cdec0954ee
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
index 6079f455d0f5..72cd403811d8 100644
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	media-libs/libepoxy[egl]
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 43372c8d670b..d039df7eba1a 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index f348387a9b19..ed74c3d63c19 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,4 +1,4 @@
 DIST kitinerary-21.08.3.tar.xz 1844012 BLAKE2B ad5ac81475c1f358d18c3ca967669799dd09b00749be74f539114940b1de9b0d0e7974eedf32789a5b6b0955948ef99cc5558201b168657029eee1ddcdbcea28 SHA512 d1fa4fc7d2c5205b396a83b63b21d0d6de578984e8c3d02d18f8e96c88c0ea636b20dc3415e16dd1fb82584fb5591a010c7d774d28544813f6321562f157608d
-EBUILD kitinerary-21.08.3-r1.ebuild 1191 BLAKE2B 0a676d1ee22ddf46b94975607965751772d5112c67916d1c9b361a8e118981069f802cbd574f7387e9e8bd4a6c4fbcb44d98faf928f083056e6d141f939cfb69 SHA512 53fa1668944576c02557a296a26ad5be425026803fc22129518dfdf0c0ef6ebde6cb4f0d56b3ddf48924046164de056c12d3a77b35efebdf649003c16b75701c
+EBUILD kitinerary-21.08.3-r1.ebuild 1198 BLAKE2B aa299801d0375df64aeb24a9b867851097eb78701a3a5128813c889d8b27cfcf258594b377df078c4f170f4bcfb5374190d7a84db4f4f69965693221e5ec1900 SHA512 d4beaf44de2dbbef34889b717e3018f65c32d0fdbda793130e6b54838015cda0e338266a79e21be6a5782c1856179a699df3c9671c8e386a6467eb7300691e93
 EBUILD kitinerary-21.08.3.ebuild 1008 BLAKE2B 16831bd3ddf9128ab107eb3bd9e7d58e4ae9b0eadb7616cddf6d5f46f5324a8b3bc4ae64cafc45f8b1d41c735c1a64b654f318fcc9b71e08eb68b96cd3b733c3 SHA512 10618cf9b55d008f7261fbea93e4532b31adf59370a9005305bd4b89c73ae73bcc1c47063eb0cf8f978e902dd994581d7d34ba233a08652c2a86c9503bf5cbac
 MISC metadata.xml 454 BLAKE2B 47c8910a8a5d54d2ae4242734dd99c24bfc2aa9a753dc4732433717975dada407d62f2487f6ac57724087e73a622dd9056ab0487183cd411b971200d40736dc4 SHA512 e23256862ef83d5b99bfe3bfd1bedab7b1c1a50cb204e5aa1d431a17afb1450e0caf6460c804dc1f907f3ce9089d51d4742192e668a01408a7b4d2b332b6c00f
diff --git a/kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild b/kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
index c34d6ce900b7..a60b23d9b67b 100644
--- a/kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
+++ b/kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64"
+KEYWORDS="amd64 arm64 ~ppc64"
 IUSE="+barcode pdf"
 
 REQUIRED_USE="test? ( pdf )"
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3ba3d77bdebd..38488c274f9e 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 755aee1e3280..dd49e659672d 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -4,5 +4,5 @@ AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca0
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
 DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
 EBUILD amavisd-new-2.12.0-r5.ebuild 4913 BLAKE2B 89efd4ca3df89f9875e7952d58a2440e88448410ed629ec77dcaf775c2a15cd5b75ba6af7b425855970c187864a1691175476c6f6d9c16f48f2f27e5440708d6 SHA512 b20582782a78fe683e4b33e5982ed5d9d6e676b7bf3c3ec2c0f5235cefbe709aa9c51bb8a31c8c0e95fd568865b7bf87dfd41e2f5ef462a2b9b126b269d6f80d
-EBUILD amavisd-new-2.12.1.ebuild 4918 BLAKE2B af107963f6342e4168a36036283982ddeb45a2f368319bce6ca74ff009b884fba0bcf5ab22b52e12cbd9b009d00ae9f2039f6484bb32a18ee32140ab08315b08 SHA512 d3f28f1e33889a8dcfce5abcaf6340cdd699ff2ddb8ffc4639dc3304be67be339463f75a5d305d68e46182bc6dfa4860dcbbeaec4d6afe713d1f374a2ee58b6a
+EBUILD amavisd-new-2.12.1.ebuild 4913 BLAKE2B 41a71ebdc6b3da7cb98c9de7b6b7ea43b2df8c19f0cbc2e512cd85d793786c5e62624e141bd304e13a10c1fb9fc10643518f2c25e57371ebd0329a443c2b2627 SHA512 451478648cd555f4d00e03335493e28a85c99db67b28a94a22fd2c1add7156389c24cc6fabf3946e3239210e8014cbcb846acd45cff605213183378c34067bee
 MISC metadata.xml 899 BLAKE2B 9b7c10ad571817f071c99963ed9930d87115f81813190d5c8b8e5e29dca556032ba312940e13077132d26c33212f28c90581c8a6d760b7aeea7f67c368c410d4 SHA512 f841f4ad9b70db155d9dea40d20de994b2d89769b63347a547adf45a2ba0c2cdf9ff8c8ed39b557beb001f2cc6fcb30c1cfc51c38aef601bd602f07e607f2a23
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
index 4245de32669f..30aa24ba326f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
 
 MY_RSPAMD_DEPEND="dev-perl/HTTP-Message
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 94d788414732..5dec91c1135a 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -2,5 +2,5 @@ AUX bogofilter-1.2.4-test-env.patch 392 BLAKE2B a72f6e0c08ca9f100188fff9da98ca41
 DIST bogofilter-1.2.4.tar.bz2 887848 BLAKE2B 4ed5c15a44f5a166e3858581ccc59b36ebde2fe1eb402cc0471378600b555b2452f4eae04d7d37dcb7638568db0c196da2d2504a3a569d7571c4aacd7e0ceea7 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db
 DIST bogofilter-1.2.5.tar.xz 801240 BLAKE2B 90fc5f0ab258ada722ca2fb79d17279b621eb089f646eade2ab41b78c44deea7f3fd8f219053e09ce5b4c64f5fc81f43a17c20b84261b22d5529c06106e80b3c SHA512 3a7280485cfe5802dd3e9721c153f88ccf28bff7a6a24590e985e860d1f1e0ddea7bde8a8e5ad1ff643e94c9fd7b26b2a5ed5a9fb991cee3fd5b0ce67ce9abfe
 EBUILD bogofilter-1.2.4-r4.ebuild 3776 BLAKE2B ca33d99ba26303b43236143b6039f640e2fd2a85ef37c3e5efd8a06d92d941e201cb25d9e7b30e3c9dd876aeba69cafe9ac9bab20f14a17984a331f173d7c628 SHA512 57925f55342e5c6adcbd62d59523f5b9082f80843e66eef83e1f5e720dee7c20b5ed7bbff9d26185a27aa991a803ae2e25589dc35a5801f68c6fc375982cbab1
-EBUILD bogofilter-1.2.5-r1.ebuild 3739 BLAKE2B f2311f040835f935230bc6382457fff1af73f7ea4858f744c4003a8c93f3c79a8cd27affbbf408d393d9939d118d1644203fca5970470fddd76202101db07cf3 SHA512 0206fda41ffc8554bb3b23d8748943d4020e17529532872bc6a23993c89309b43393a21c1351aba4ee620f7363c4de3bb69ac180177f697456b470c43a0bede6
+EBUILD bogofilter-1.2.5-r1.ebuild 3736 BLAKE2B 2e71910f674df3919c2ab473084c9e8f1636e2493f9868177770fecb52d067046e3a3b6070d5fb75033380255a1b7d43d514b6a0b9d6f1690d05c40ae59d49bd SHA512 e9390984d632cdc534c902ecb15bb50864afed8609d4311b4cd57e62738e1a28d7072dc65159f14ed291b7df7ddd73970222f3dc7438e2e16a7f643c1c49d668
 MISC metadata.xml 604 BLAKE2B d67129c25f986ca450dd263215cf6f88b5ee0b16ebb3e11aff7d3a8fccf9152ecf78d29b2c02d893e042534b81e603c7aed866f802808be8b9a5aa96ed6b10c9 SHA512 5042ce7da18ccf0327e38b092e0602fa477d646413fd07bd9e58b66883179039c3d4e85d3644f1e9e696b1241447a460eab44aa3ef87470f41a2f32757be5258
diff --git a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
index 7ea3c838d80c..e207e681e47d 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="berkdb +sqlite tokyocabinet"
 
 # pax needed for bf_tar
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index dc23f7af138b..aa46122775da 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/ahem/Manifest b/media-fonts/ahem/Manifest
index 5cef4cf6c089..f67f70cbfaa7 100644
--- a/media-fonts/ahem/Manifest
+++ b/media-fonts/ahem/Manifest
@@ -1,3 +1,3 @@
 DIST ahem-1.0.tar.gz 35539 BLAKE2B e08e9847aadbf7a46fc6e19dd7194d256f24d17f06002ad2c152827f2c2ee82ee40c0f8d5829477e36ebfdbd7f435ff92aa545c4870e0cb91e47a159120a96ad SHA512 626e37c3a6c8b78443e6ed4be565f1f568f3542c8a6e7587e584da21e007875a69b8a84a977f8699eb39c5755661942a7543799b789ddc795eea806195f3fafc
 EBUILD ahem-1.0.ebuild 417 BLAKE2B c04918b6df41c47d0036fdb7bd163806a00d1555cc27debe39ef5d1e666edb996e52e4f3e3e25c2cd3559b1c9b2f4b82380002d00d9cb556321dcdb98af1300e SHA512 0aa1624668d16c21095edf09717634ddd40061892ac42345cc1480df5828c9da0564188b1d33312181d3d544d1f536329e7700222416596e0f0e622dfe090a31
-MISC metadata.xml 243 BLAKE2B 8732fbbddf31be18311fb3bcf6abee6c0fed379987a579f2c898b4082530a387d697abd1b476567bffc3dbc96f9d3800d021b4a0f9b0a62f9f191af17c4e090c SHA512 2e0b995c0cade8c94e14a1914595396aa9054c4a0dae3d067dec732813de542432a1e6fc5d5fce05f105d5047c9bac5420a49fce41e8860c91ceb57d9d447f34
+MISC metadata.xml 267 BLAKE2B c138d7ea7e732305a39de9c63ea50cee095a0a714d1de0e8b542cab507a8cac54a713b3b83a6e0a2341766bf1b42423ead9af7d2bb4feaf8587aadedf514cab4 SHA512 647d8fb0d7b888b0b9c92973433b96494e3f23640467e7514d7a1c985b3e016d28955917c3dc8250435868647f744a29d043139c4613516839f21e1ddfd75660
diff --git a/media-fonts/ahem/metadata.xml b/media-fonts/ahem/metadata.xml
index 0b62bf404d6b..bcecbdc00a14 100644
--- a/media-fonts/ahem/metadata.xml
+++ b/media-fonts/ahem/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Kozea/Ahem</remote-id>
 	</upstream>
diff --git a/media-fonts/alee-fonts/Manifest b/media-fonts/alee-fonts/Manifest
index 9c8be49bdfc3..b92e41cb5a9f 100644
--- a/media-fonts/alee-fonts/Manifest
+++ b/media-fonts/alee-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-alee_13.tar.gz 702378 BLAKE2B 3a99b6832dc0216bd86065257b30bafff281aacbdc48d16bed843d134d2176b5d96b9a9aa242caaafe4581a90627cfd56dce6815e701148e85b6f89f43fb12e7 SHA512 2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c
 EBUILD alee-fonts-13-r1.ebuild 490 BLAKE2B 2ba4084fb7871222c48feca4d816c58ea2966667a285c6cc402af27167e31acd41d112530ca50b2e87162aa95dac89b10f08db126be4c8ebe925e96cbc282187 SHA512 543fd6ec4666cf71f676eac346c88838a977803028f51bcf748cfa0dc26fee4fff9ebb5654672ff899060d4b94d461104081eeedbe9c50fcb3251a31f3cef9bd
-MISC metadata.xml 326 BLAKE2B 8ee0f43a1770af568dc66b8bf6b593822a2118984264f0433db8d80d92e15ccf630dccb5bc75f450362a22f67193d90428e8321fea5f640bf0a892f9d7cf6af8 SHA512 1f38180854ea9bb8b419b54c6d4c1487ee804fab1d551e306fb87a8d1d19db28302ffcf63da276a66a100bb6306f2946e52fea622aff8fd3982afe0f1d3d0610
+MISC metadata.xml 358 BLAKE2B 90241542c0bad4ab94acdf9d9ed214e2157980dc916643a4dc38fbd1f2030fb7751cd95e1e5060d454b8612af8a3362df2976094861c629711254f5182c7a3b8 SHA512 1fd275583b400559c99da83c553e283a5ff4bf7d292c953d6356a0425738e2a7ece4cf5c7549baae3e86947c4796ee49192a97a754346d9ae8304e51a1835eba
diff --git a/media-fonts/alee-fonts/metadata.xml b/media-fonts/alee-fonts/metadata.xml
index f8581c0f9b0d..c96b9b4aa298 100644
--- a/media-fonts/alee-fonts/metadata.xml
+++ b/media-fonts/alee-fonts/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/alef/Manifest b/media-fonts/alef/Manifest
index fe9379ae1af8..eecd4cf10cd9 100644
--- a/media-fonts/alef/Manifest
+++ b/media-fonts/alef/Manifest
@@ -1,3 +1,3 @@
 DIST Alef.zip 799409 BLAKE2B d1cf293ef6af0965d8cfd8b8b5690daa0035cece6c13615f9fea4cd597cf521d546954759f2acf54f249ee36f0d47d1079246f7eb90ad7c3f456425315e269b5 SHA512 84b19a984f60174b3b49fb0e1e7fc53404581c83d4c58884a5b01aee55c70534906664cac8795d2651a56aeca59e3f5a8b3e7e8275b50b1c3c9defa91bc341bd
 EBUILD alef-1.ebuild 400 BLAKE2B 804bfb5d904e97cb6926632c559bbd8a8145f535f6ee043625f45a428f2e87893a2d3b6995d2f8c9f07adc29def9cd2fe0942a38ba7e17e44b6c21f3d8e760dd SHA512 36fda0d8df9810f70fac1224eae738c1ee0bf7b102c78ee3b5cadf0dad149a635e027ed8e9441118ac6514d13f999092ebffdd2dd372ea25055d69278cd01bd6
-MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
+MISC metadata.xml 275 BLAKE2B 9a4296de31ca90f9a7fe766a60e0e478a7a8088877337c74aa160bf1dcd5c674e87c1c3752b077b96e9edb9ddaed267e2924a398172eb971e52d1d58f43c077b SHA512 f69f87dd848bd04dd19b5ab4d2ddecb733112171dd81d1cc07d95c15b307f57933c50932225b1ff2bd98151245c2efe3092aae8334bb0000b7be7cf37d778a0d
diff --git a/media-fonts/alef/metadata.xml b/media-fonts/alef/metadata.xml
index 8b1443351bf8..f6a29866d4a5 100644
--- a/media-fonts/alef/metadata.xml
+++ b/media-fonts/alef/metadata.xml
@@ -5,4 +5,5 @@
 		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/alegreya-sans/Manifest b/media-fonts/alegreya-sans/Manifest
index 2c6040484066..65b2a9c793cb 100644
--- a/media-fonts/alegreya-sans/Manifest
+++ b/media-fonts/alegreya-sans/Manifest
@@ -1,3 +1,3 @@
 DIST alegreya-sans-2.008.tar.gz 16351420 BLAKE2B 163593cda1419bbc24503c9c892349c941a7de9e85e6f26614d54092098d0343d388018cd92d940e55ab073347ad38dc961b03bc2982ea6b96ea5415a437018a SHA512 8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4
 EBUILD alegreya-sans-2.008.ebuild 572 BLAKE2B 1cb53ec998ee9deb666baa6b7ae6da366dae9eab550ba063099ee5dab1e761e928cf71e6fc9091e736e9c7deb521282bb6c05b1ab18fab1c3609842ce26b2de6 SHA512 9d6884410922c8a20df9124ec6467654dc3e66347eb80ec6c52a21c738ce7cbd97dc26c7aa3e6e024f4ecef9121ad8c2c6a982ad27725fb0ac0c2def457be523
-MISC metadata.xml 335 BLAKE2B 3baf223e9efb0dede5b802c2f594b185861bab839f082417deaacd20be0ce5c589d1635d2367978861b2954dd9d06759885f3d76fe966ff0f8d49cc1baa1319e SHA512 312552eb33c4b6280ad9c7bbea2cad26767d6eef11d1dded2fd08157b811dc036efe88d495b01fa8258dfd6c8e4ef8ba29f3187159878ddb81fbf7b3e4ea0e1a
+MISC metadata.xml 359 BLAKE2B d865b40c2ee91cfa922e8ff0465393cbc5a5d5942739fd2f596cbaaa441b55e89580d9ab72755b90d44b8f29098bdf10340b9ccc4204a5c012ce78cda0f34926 SHA512 29d42f07311a19b54503028fe7ea766e2129ba50faa16f151dff78209cc2eab2738aa6e360b5a137bd813c0fe1ae59806af6af2fd2e73846665a868edaa001ee
diff --git a/media-fonts/alegreya-sans/metadata.xml b/media-fonts/alegreya-sans/metadata.xml
index c8576547a6a6..b2c4673ea024 100644
--- a/media-fonts/alegreya-sans/metadata.xml
+++ b/media-fonts/alegreya-sans/metadata.xml
@@ -5,6 +5,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">huertatipografica/Alegreya-Sans</remote-id>
 	</upstream>
diff --git a/media-fonts/jisx0213-fonts/Manifest b/media-fonts/jisx0213-fonts/Manifest
index 3fda738b3093..54ce7d642063 100644
--- a/media-fonts/jisx0213-fonts/Manifest
+++ b/media-fonts/jisx0213-fonts/Manifest
@@ -11,5 +11,5 @@ DIST jiskan16-2004-1.bdf.gz 303930 BLAKE2B f7602e0d8331b3fb94a3f20828a0befa8d406
 DIST jiskan24-2000-1.bdf.gz 516369 BLAKE2B 626f981ad5381ba79d0c86f2716d4f435971cbc5d75686447b4912f628ef40a3c323e262cce8a2e46cf2d455ed794893fd657492aa08b100d909ab629054478e SHA512 0733b18ad3627a250372f64cac33cc4530a6ecca2f230f9667a9d767e618c02037351350649c6e1eee4ebb0fc1347289dcb14761f04b337c126df13996f772a9
 DIST jiskan24-2000-2.bdf.gz 155750 BLAKE2B b0382af4ba21b837bd0fc16042d750868fb9a4ca688bbdc9605616252a4c1cfa2c2231a6760a3fdf35e7315eaf19294a46c79ddf604606d1ce43b699019c9914 SHA512 8495f6a49d5e20f0134efaec2af06089e141433eaf32acaac29dbca0d0244028716c5464ac2925db2fe632b3605722b28dcd11fda7f27b04d204eba8792cf133
 EBUILD jisx0213-fonts-20040425-r2.ebuild 1196 BLAKE2B 14a569145e18839acf100a655e2fa38ec43eac0f148a22f3b8c79b1818b4c4fe34e400bf15b8398ae30df93bf28094d317ee3b97653d7db6d7658d22e083da39 SHA512 560974de97c1e9578f03d8578c661f43e0fedfb3774f9894b972da6ad744bc5742cba145253eda58aeafe1ac3b3605f16daee6ed6743cc0c44aae511d7c303d5
-EBUILD jisx0213-fonts-20040425-r3.ebuild 1487 BLAKE2B b35d7120e2d963b1055391d94d0dce60de8bbc45ef5b2042b97372c516b0c9222d86a0edebbae5f5294277f4338877f742e68207c1ac9992b576954f095a0c14 SHA512 e2e0a906217854e7eb59d34bcc67341a598fea34595b6afe9647b0e383e22713d62a0915e0767a869ca53018a530263edd9c8ca4bb01377c524d22f701f701d6
+EBUILD jisx0213-fonts-20040425-r3.ebuild 1505 BLAKE2B ea61e0b88bc87ac5de024be807a4d57b154a90affa94745ed0ba0e9afb4e2a3d5f20463b5af8e5890a61d5e9afbfb259aca897522003ba4b06e6914ca55078b5 SHA512 0264b413d421aa7e396e6099db87258eca2c759d86a055661ad00ac3113180dc37fedde2b5c58c6de1a3be3bcc5c47460668cb8e3871707d986fd9aa9622ec3c
 MISC metadata.xml 326 BLAKE2B 15513c6a97219fe190af06e48d3882fd0cd1d43401d6bdbc43852e1c97817cae0b0102dbc736e6c8be62951faee0151db7377bdf38e8c15c796c80b1ada6ff53 SHA512 01b5267da9264cdb2750c0f70d571141f49ea9d1a95ccb36d9d5b006b26604f212079aa53ccc840dbdfdc8a9e17f717635866819eb2e8fd9f2f0b0afd79350d5
diff --git a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r3.ebuild b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r3.ebuild
index d57ec8506f14..1ba7e949cfd2 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r3.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://gentoo/jiskan16-2004-1.bdf.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~s390 ~sparc ~x86"
 IUSE=""
 RESTRICT="binchecks strip"
 
@@ -36,9 +36,9 @@ FONTDIR="/usr/share/fonts/${FONT_PN}"
 src_compile() {
 	einfo "Making bold and italic faces..."
 	for bdf in *.bdf; do
-		mkbold       -r -L ${bdf} >${bdf%.bdf}b.bdf
-		mkitalic           ${bdf} >${bdf%.bdf}i.bdf
-		mkbolditalic -r -L ${bdf} >${bdf%.bdf}bi.bdf
+		mkbold       -r -L ${bdf} >${bdf%.bdf}b.bdf || die
+		mkitalic           ${bdf} >${bdf%.bdf}i.bdf || die
+		mkbolditalic -r -L ${bdf} >${bdf%.bdf}bi.bdf || die
 	done
 	font-ebdftopcf_src_compile
 }
diff --git a/media-fonts/kanjistrokeorders/Manifest b/media-fonts/kanjistrokeorders/Manifest
index ada8e15ee60c..b32725288567 100644
--- a/media-fonts/kanjistrokeorders/Manifest
+++ b/media-fonts/kanjistrokeorders/Manifest
@@ -1,5 +1,5 @@
 DIST KanjiStrokeOrders_v4.002.zip 9453962 BLAKE2B c340e53f4fa8fd56aa267cd5b9b1d9ebb15adcbe814c9ea00b9adacddbfee70e4925c7fa6a8939d16d0935e9c0067d69ba4dcf9ce9af346c2b457c001631b905 SHA512 49b5f5dbf70e900e547d5d0fb2fb51d2e8dc73e6dae3ee46e197ef5e2187c445fc39ca69cc69b5e7612b600e065cb17e760c3f48b6b7dde8f6ccccabb3382a6d
 DIST kanjistrokeorders-4.004.zip 9028084 BLAKE2B 95c763e6c6d0ec0be7f451539bc13aa6d0abb6a73c16cd9a4fab42d6ca380ceceefaf30ddea341adc10e2eaf0fdf50e26e83babb27819f97a35a0c9d450bacd8 SHA512 54a0820031da19289b820300f2569387cef77bc80f7febe9d28c88d4c3aba53973d1c8ede337a689508a28fbbf8b8a4d5a4896c2db353774229370ff9fdd01e8
 EBUILD kanjistrokeorders-4.002.ebuild 527 BLAKE2B 173856ceb5d20018e0b16ae31a34c3b0ffafc3bda7f331fd9d229a08446e9b2366c5c3304da08357a1d7b8ba2f03222eb7ccbda863f0186bad342c5596b0d0b8 SHA512 36900ef69f239282ba124413c787cf07ed2496e0f2fde62092a0ca7fa53911141993c037a56c1f7888a5e52c33cc74f811206ac6409711c95a4fa249aab74003
-EBUILD kanjistrokeorders-4.004.ebuild 540 BLAKE2B 76041d66ef3ba36975f60732e42338d923c621f7ecef4e06751b0b6ae79672e7f7b6181d3ce5ab52bb78880800c03ef6d5f755b101d7a4009f31757ebabb74e1 SHA512 6ced1775df4ba97d9b16b7b8a4978d22d9b590aca33076a8434a95abc922aafa2151fbc02d58cf3795f52cee72f41d49750e523b167c4e5aa38083da45e18dfb
+EBUILD kanjistrokeorders-4.004.ebuild 538 BLAKE2B 930968389b9d10e7e1c0f2dfff8fa86d868d4dd52d4fdd8e46c8c961ce7b2de2462560a01c0f473d46e0d367cccf79826319ab510bb03aa85f0c9661b88fb9a9 SHA512 757bb8693ae2053d0bc3484e071260c7bc7f5234a26d8316f2b0d8aefbccc958014f7588046f2dfdc56fc0646ac690b63061aead69b134ffca6bd2484de389f0
 MISC metadata.xml 333 BLAKE2B d55a520fdae95aa984ef8fd202229e1308e2d07b8cd3da5a2f4fbc4e552c6d5321fc0de021c3d8ea718c2cebb3dbbd75f4d364335756f1eaadb0eee53bc37d4f SHA512 0021239202b87e9354a68648f57c8a15a37e23d99f46788e9e7d3984a649e1601cdfefa8cdfaef25fd6e89dcb3dacce05d28da6c2a523041cfe6d3233e1fa9d4
diff --git a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.004.ebuild b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.004.ebuild
index 59883d19b6fa..9cb964944cdd 100644
--- a/media-fonts/kanjistrokeorders/kanjistrokeorders-4.004.ebuild
+++ b/media-fonts/kanjistrokeorders/kanjistrokeorders-4.004.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 6c9a22f223a0..7ef1ea05b142 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,5 +1,5 @@
 DIST Padauk-4.000.zip 1316567 BLAKE2B 466d9aedad691afa7ae94a24652b156888cda2a926846fe705c953e711b00bff7c053b1f6d4e4ae4989a6fc91d87e984539315b84c0fff10815b8cfd18b80da1 SHA512 3ed97d5e8b47f8883bcab980aeb4247f4878ef8306773abdc4d1387817a3bdd5d8981c01cebbcd6b1c8dd7507d30a3b2879d607df66fcf7bc33d3db5d029016c
 DIST padauk-2.8.zip 556033 BLAKE2B c957dc2b65802010fc4f888ed2e900441030ae161b1f8fa3e0ea9c5d6ff403127a84ff4eebb00efa48968699392a9a8d242657e68cccf08daf8a76fa17ed8898 SHA512 7f9c4f89bf1c2ee097e0beaada6853b2b40d8e1cd557a94286382a412af2e8fefd30b54b302ba569fe75f281ac9c3b9e8b2210102adde9578bc4bae0114929dc
 EBUILD sil-padauk-2.8-r1.ebuild 443 BLAKE2B af48aedb8448a695795818e75e2b190f5f4733bd0c652007fdeccae732d940a26d65ef0b32148936e1bdf1b2f5a403d635a6c32c2d42439a281696decfc652fc SHA512 6094589ef8560a3ce475f0284a18e3e09033c763da544c8d3f03816655f88cea4ad34a469348350a4011fa55163791f3a6309098f9700a9bf3f2fc44508792f5
-EBUILD sil-padauk-4.000.ebuild 485 BLAKE2B 68480195e796af7cadbdd99344336dca6349cd482d735d01933d8b144c21b00db56b42d1c2d4e8fb735e778f737d7cb33bae47bdb3f33199d869097a188bd42c SHA512 8bb4c305f942e72a83d3d6a86d8d0b4343646420967dcdb8bcdfc77274555e60fc3801e547413e96862d411c76f1aa7c2b99b6bd17037991aff2276703afbdab
+EBUILD sil-padauk-4.000.ebuild 482 BLAKE2B 77d2245ddfa3c770949ee357048b3e69dd723a7e81185c8776b6e056865cb58f2e73af61886fc1d1264968287670c0f3357e76810ceca65e49235d2f3a7799bb SHA512 81f53251a5273f568abc2b21e95f86eb106dc2261dcec78fb56a2e90cb140a9bbbee5957f965fc2a8e85bab8365d2459c21c50735e4c9b7c28e89735125a63dc
 MISC metadata.xml 415 BLAKE2B c0e161f608e6b211fd17d819f7925608525c73de2a310f9bbff99aee64dd5e6ca644ceaaf658debd37e73a8a6641821ef13457ed4dd5b5e4ef0c1fe39657d343 SHA512 c0a5544675f3bb2276ce8f673ccc472ece76162e61c1ebb5585d51deffd9c3dd2148f3935b043b620a11c9fe197e76d4c5b7be43ba8375874ba6dec94cfe1282
diff --git a/media-fonts/sil-padauk/sil-padauk-4.000.ebuild b/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
index 88b58da35ce9..34d4cc756d31 100644
--- a/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-4.000.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/media-fonts/stix-fonts/Manifest b/media-fonts/stix-fonts/Manifest
index 825d86a3f60d..f1587f4cf07b 100644
--- a/media-fonts/stix-fonts/Manifest
+++ b/media-fonts/stix-fonts/Manifest
@@ -5,5 +5,5 @@ DIST stix-fonts-2.11-STIXTwoMath-Regular.pdf 988219 BLAKE2B 614fce509b4890aff973
 DIST stix-fonts-2.11-STIXTwoText-Regular.pdf 371400 BLAKE2B 874d78aac0cf335f5d7a616ca54b8efd707d15a7e4a9d6c18541f277554688fc321f51d3c13d7ae9c55a916b8e4a17730c63c7886bbd81c509b6883c97096e5c SHA512 2cdfe0f3906480e8449c969ee52ece50322b27bf1d9f3da664086d0846fd5fdf007d5e1daf181a0cabc8b9a5c63645722f7ce3d3cd69d3930c6b3d3474e7f032
 DIST stix-fonts-2.11-otf.zip 2151460 BLAKE2B 77640182e9672a7d478068aafcd527620c3d1326af2670b8fab96c61fc0944b7158831c3262a09061cb3e66e81562f91078a1432740d4b733787699b740dfac8 SHA512 629723260c79cd2ee2e07e4b70a3022e6ad2dc476088108a17f85276673b28933b327f76f945b373b66cc52360df14ea4dcd8d9c9f4424af06d065eeda010208
 EBUILD stix-fonts-1.1.1.ebuild 679 BLAKE2B c20d1e6d0077b7d04fbccbeb2383bd003ffc10d0c589691779c8941b636e2b4be443811dbc074d404771bdbce3db63b9d525ba4c62e82c8ad2e39adf454794dd SHA512 6f052ba2927acf04090864f705d8187a540d34f5a8b86476167ce4b3a1d56887dc1063dfb6bc780e9f31c09ba6774efd6cce67ad49c84f8057e1eae8125f9574
-EBUILD stix-fonts-2.11.ebuild 1002 BLAKE2B e40f81d6c0f9740643cdc552a48fa120313ee8711d3ad4b4ecfa989138027168344f42e0e9448207c29534dd0cfc2783e8e4568a7bb8fefc55001ec5eff93afe SHA512 e74a9d96c40add98647d78a7600b244a12b9f31dea164033bffa87362b44fc47de7d895328d4f8d715235827f03a1a86f533b3483381bf27f8b7cf2573fce43e
-MISC metadata.xml 318 BLAKE2B 331dc56b4abe052e586bcdd089380586eaf7159689da46c538d8e372d7c2a095e655ff9e6a86ef64711aece3bf5c1f8e8db0839b361979a9d1eeca51925ec726 SHA512 474f0fe5efc3713982ab7a9e91506f9dba789594f65e7e0e3d4b8d518963887c3218a06383fe7ab5134a3294ee63d96b0a6cad371bc386f3a5f5afe7fcaaa17b
+EBUILD stix-fonts-2.11.ebuild 996 BLAKE2B 869cd72f44159c8dcc24f4312cb02a4b8ab020c6fcd9189e3665fdd2ee21db2a3af77650505e6dafac5c0f5a377f154b7afc006218fa2dcb2a514ac4b422c0ab SHA512 53fc3798f80cc5bfcfc932ea46a81a26949809a64fd9ad14a84cf7963ab3e9fca1b4f3c798b7db8c6565a8e8ad1dda4d7efcee70290558fff6e0bf1a5a501ef9
+MISC metadata.xml 342 BLAKE2B dd7f8af5a8462739b56734b464eed5195b9144e5b9ac271d547148a7b11579a9c2b22efbaec70a8c9beace3328f5100df41e11f7f1449213ae0eb746aa73f828 SHA512 2eb6fdad7e3cdcde154d5fdcc04d683b0efd01d4b561db19d72ec215aa9bd409be6d136ec16350142821a97ef2c8d1a8891fb27a8816f493b7cda87bed7b78bc
diff --git a/media-fonts/stix-fonts/metadata.xml b/media-fonts/stix-fonts/metadata.xml
index 271173d4af6e..7c8041750287 100644
--- a/media-fonts/stix-fonts/metadata.xml
+++ b/media-fonts/stix-fonts/metadata.xml
@@ -5,6 +5,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">stixfonts</remote-id>
 	</upstream>
diff --git a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
index 37c371745996..12b5f1c4807e 100644
--- a/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
+++ b/media-fonts/stix-fonts/stix-fonts-2.11.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/static_otf"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RESTRICT="binchecks strip test"
diff --git a/media-fonts/ubuntu-font-family/Manifest b/media-fonts/ubuntu-font-family/Manifest
index 293fbae37e41..20ae8e619756 100644
--- a/media-fonts/ubuntu-font-family/Manifest
+++ b/media-fonts/ubuntu-font-family/Manifest
@@ -1,3 +1,3 @@
 DIST ubuntu-font-family-0.83.zip 2092263 BLAKE2B 996e2cf480eac3e3633bdcbc40766fe22b670152c9a4c462d9af7b1b85a7d0310ff118ad0f9f2670a56718391e684479bb5df74a5f31c2dbf4430dbf9c7cc189 SHA512 d9ab7afc8aab55810de6e403aa02c0118bb35d94844cc14bb07b71daef4c6d63a9c927f0e81a9f97d29904512d94fa0226fbff2341351ac000fc233d2dc55727
 EBUILD ubuntu-font-family-0.83-r1.ebuild 544 BLAKE2B a69224a52a9918f180105825437ada3629bef2e2508355463ae9a3dd39a90ab8b6ec47661a0f83654b8b09c14bd8592aedc7c26d0c49f71efcdd8bb7d6cb8591 SHA512 a62b91f87743c068a9beb5da87d40ddf853a7253d2276b64ad29a9fa2f7580e92b3f3a55fe6059257a2182e5f3267232643d64896f9c272e7c07269a9fb8fd29
-MISC metadata.xml 239 BLAKE2B 5aaac778361cc8f607c6587e338cb80fd9a032e722766c60e011327e58b327fd4ca5113b66b281273c718c7492edd2477a0d702acd900fd9e376faeaedf717b0 SHA512 333c4df4d2002923cb872edc1e4e4f121563d73b157a8b2a4605ee449c759417014e9bc1342acaf697325d3d3bd8babe5930bbe4e08df90650cd1a52a0ecd337
+MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/media-fonts/ubuntu-font-family/metadata.xml b/media-fonts/ubuntu-font-family/metadata.xml
index ad76811405bf..9448af9c5670 100644
--- a/media-fonts/ubuntu-font-family/metadata.xml
+++ b/media-fonts/ubuntu-font-family/metadata.xml
@@ -5,4 +5,5 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/unfonts-extra/Manifest b/media-fonts/unfonts-extra/Manifest
index 3549ff31d284..a37ad87b303c 100644
--- a/media-fonts/unfonts-extra/Manifest
+++ b/media-fonts/unfonts-extra/Manifest
@@ -1,3 +1,3 @@
 DIST un-fonts-extra-1.0.2-080608-r1.tar.gz 11375538 BLAKE2B d6075e5ac0de7b6d72df02a6dd9bd5bc4df59b7cf6bdec48472cb69a719e2639e21873f7df68017063cba678bacb6d71136d78deca885759c854c7260e47cc26 SHA512 9ae5e8b933680b9422aa96cd0151359d228c1324b430e5f2bd1f7e3e0b26d81902b1b3ab99ef6d1fdd08b88c35d791af982618a9a56188af60b5e9679bd0316d
 EBUILD unfonts-extra-1.0.2_pre080608-r1.ebuild 520 BLAKE2B 6b1bd4617fd64905d4f5c211e18dfea6608ae38a270b728de055dbe09cf6b26fbfe78e1c88e9c27acaad4679711b6b6ed690efd907b87e0a4a021d2f759f40b3 SHA512 be551c39c81f8673bc987df85a4f61658b704258e7ce5fab4a9d10feb00032278b113905c2270a25a173b980d9fa6145ebcc3622266617ccbcb0bd0ee17c877b
-MISC metadata.xml 326 BLAKE2B 8ee0f43a1770af568dc66b8bf6b593822a2118984264f0433db8d80d92e15ccf630dccb5bc75f450362a22f67193d90428e8321fea5f640bf0a892f9d7cf6af8 SHA512 1f38180854ea9bb8b419b54c6d4c1487ee804fab1d551e306fb87a8d1d19db28302ffcf63da276a66a100bb6306f2946e52fea622aff8fd3982afe0f1d3d0610
+MISC metadata.xml 358 BLAKE2B 90241542c0bad4ab94acdf9d9ed214e2157980dc916643a4dc38fbd1f2030fb7751cd95e1e5060d454b8612af8a3362df2976094861c629711254f5182c7a3b8 SHA512 1fd275583b400559c99da83c553e283a5ff4bf7d292c953d6356a0425738e2a7ece4cf5c7549baae3e86947c4796ee49192a97a754346d9ae8304e51a1835eba
diff --git a/media-fonts/unfonts-extra/metadata.xml b/media-fonts/unfonts-extra/metadata.xml
index f8581c0f9b0d..c96b9b4aa298 100644
--- a/media-fonts/unfonts-extra/metadata.xml
+++ b/media-fonts/unfonts-extra/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/unfonts/Manifest b/media-fonts/unfonts/Manifest
index f83b44188722..b593cef085a8 100644
--- a/media-fonts/unfonts/Manifest
+++ b/media-fonts/unfonts/Manifest
@@ -1,3 +1,3 @@
 DIST un-fonts-core-1.0.2-080608-r1.tar.gz 20117428 BLAKE2B 9b14a194e71aab389b7f72819238398df672fb457420db7dbea9214324b1286a5be44f7f8cdbd67dd9de93f77d350fd6ed2146d4471e0c761a1476d114f97024 SHA512 ab7c394931b5dcc6a7f6db89b69928ee769cffcca08e1266ecf4864bfea06d9dacc45c4d821786de8dad04b84b0de78a9db84bfcbb0ec506999dbb791570d941
 EBUILD unfonts-1.0.2_pre080608-r1.ebuild 512 BLAKE2B 095b7b985199e5b4d7d058b58925382c96afff2e85d942b9b8d97f7daf32f3a7c14104d92f7b03a1ccfb04611dc9f1378c10eb519f92ba028f4edbd08ed8b909 SHA512 13f9f0bcddc31e106c9157e700e2449411608f9ad90335f3abc3e085e205db332563d95554685b86d6220eacebcf6e8fa2acfe42fd1c104136f9ea8c7e93b096
-MISC metadata.xml 326 BLAKE2B 8ee0f43a1770af568dc66b8bf6b593822a2118984264f0433db8d80d92e15ccf630dccb5bc75f450362a22f67193d90428e8321fea5f640bf0a892f9d7cf6af8 SHA512 1f38180854ea9bb8b419b54c6d4c1487ee804fab1d551e306fb87a8d1d19db28302ffcf63da276a66a100bb6306f2946e52fea622aff8fd3982afe0f1d3d0610
+MISC metadata.xml 358 BLAKE2B 90241542c0bad4ab94acdf9d9ed214e2157980dc916643a4dc38fbd1f2030fb7751cd95e1e5060d454b8612af8a3362df2976094861c629711254f5182c7a3b8 SHA512 1fd275583b400559c99da83c553e283a5ff4bf7d292c953d6356a0425738e2a7ece4cf5c7549baae3e86947c4796ee49192a97a754346d9ae8304e51a1835eba
diff --git a/media-fonts/unfonts/metadata.xml b/media-fonts/unfonts/metadata.xml
index f8581c0f9b0d..c96b9b4aa298 100644
--- a/media-fonts/unfonts/metadata.xml
+++ b/media-fonts/unfonts/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index 5649dfdfac46..4789bff534a1 100644
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST urw-fonts-2.4-9.fc13.src.rpm 3198315 BLAKE2B 9f4c026af2ee6b472454be43b4e1d11616770cb63841fe022762f18a7c71abc37e442102a3d54b880a6a34117442cf45b2d65133ef9cca564e55a26ac1179824 SHA512 cd8c9eb9e56480e70129c14cc744b944fe51fc616b8b5da46b7251520c84486c6c4354afdd7517569ba7874255c00b755aace076dc2cf1a1d8bdd30e41322d4b
 EBUILD urw-fonts-2.4.9.ebuild 1908 BLAKE2B 89a11d05ed31e023bc38577805f5ac46b371a4e761516ba30d6d91476af537a42b6edf874663757cd57007584d354852bc5fb8ea3fc3f13f678ca3b228c47250 SHA512 a5cf6ef0112e16828264f31a1ddc4302fd667bf77691f3ac943e5d75a0e14cde23c7f0a5c97ecb486b16eb23668008a4d1af2f5876f7604b3da79315a205d57d
-MISC metadata.xml 235 BLAKE2B f469fc8727ef3de05c8a1d43d640dd5bc6aee0158f82ba12c1024613b9c4c0a681f91528205ecd30d47cb9aca08ab788f7f595168bf0ceba25d8a2baf34b4cba SHA512 3229f3ecdc21ea952f5d40215f5a75129d165b9e34f80f7194842fe6362ed4f585470c7f6e9751825313345cade1f153d122d59f67016c26b5d21eeef64dfd22
+MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/media-fonts/urw-fonts/metadata.xml b/media-fonts/urw-fonts/metadata.xml
index 9a448dfc2e7c..9448af9c5670 100644
--- a/media-fonts/urw-fonts/metadata.xml
+++ b/media-fonts/urw-fonts/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/urwvn-fonts/Manifest b/media-fonts/urwvn-fonts/Manifest
index f3bb02e25b7f..5eff7dcf2d67 100644
--- a/media-fonts/urwvn-fonts/Manifest
+++ b/media-fonts/urwvn-fonts/Manifest
@@ -1,4 +1,4 @@
 AUX 65-urwvn.conf 459 BLAKE2B ffa20a6891914076ae5f6a118d77890cf6b9bc5b8e9f590185e3be5246ae541a852a06dceece8f74bf003fb85c708d0d05e53fa59098d5cad4e4363858c6b460 SHA512 a0a676f600fae81ccc0909a2d1ba2c45cad77039be3bf367fe9213dd0bee6decd02637e83079ec4c03957b93e62b01c8c62d22456a55f26cd9b0d9d53fac3a0c
 DIST urwvn-3.05-ttf.tar.bz2 1322045 BLAKE2B 119b6ee2933db37f2c3fa24a9663db28bc9d43e755af28a48269359533061a423d01263c2194bdd4676fc9d4f909c32d3283d6330202d72eaf222c9d5cc6cbc3 SHA512 529f59fb0088a266bc6c71077b5f5f7d2282b544d375578f5680bc1cf5b52ac1942513d6aeb7faf26f93d08772489d630ebcbac90c646e01cb4a18c61ea5f392
 EBUILD urwvn-fonts-3.05.ebuild 911 BLAKE2B c8e94f44f14f04c7d931338709f8e2eabe22119db5934f7923607a9a01ad0a91e587166bef966338c6fe9a61e12b47b39027f6a4f4ad5c2e88f78ddbb67318e3 SHA512 f8c5274724f7840aec469f41abf6b2d04a611b66cbd1e1bfaa6490ad54f4859a4b0e2d8c62ae9623fb1f61111bbca8eadf4a70f11a4cc98a6f5d63c61a937aba
-MISC metadata.xml 324 BLAKE2B 37a618562a186b528f36b627be3aacc16d7208249511a2d39063b85366c1525fb476479b8a6c7495c24e0c31ca063258a6895e0097530abc3704fba41bc7d982 SHA512 9b6cffb9dd08c4c98879783bf06fa0ee34c7fa58d5fea5c9f92b392d6f728af0ce23669590f0ef43766bff680ef9600b179a82eb5d9eb93ff0b7d8cc05e09b18
+MISC metadata.xml 338 BLAKE2B f015d0e032902e4a6223fae22812bb767c48cf23bdffc7ed3f4ca425537cc533c4ae1b1cb458fa93d9510c03680a4b099710825a09a2e446fa7beb286b352da9 SHA512 7eab70891b7afe5111bad42714e17d4c02b9545c72e9f0d91129021b0d06cee0768020d7ecea170535b594d5f5e96543a6844f9bde6dc158beeca7334fa79522
diff --git a/media-fonts/urwvn-fonts/metadata.xml b/media-fonts/urwvn-fonts/metadata.xml
index 6ea5786b9205..488b432d190d 100644
--- a/media-fonts/urwvn-fonts/metadata.xml
+++ b/media-fonts/urwvn-fonts/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">vntex</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="sourceforge">vntex</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/vdrsymbols-ttf/Manifest b/media-fonts/vdrsymbols-ttf/Manifest
index 54df0ca56f35..1c3994a36009 100644
--- a/media-fonts/vdrsymbols-ttf/Manifest
+++ b/media-fonts/vdrsymbols-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST vdrsymbols-ttf-20100612.tgz 662333 BLAKE2B 5de2f5294c44d2255c229be57bc86130207f07329910e3c53171eca0f81942bf9b5f514c21358365d410d6b80f4dad9745f9e1bccd0710b68621e717920345b3 SHA512 fe5d19fbe8db9eb214f1fa47d376ff6a1fb39a3c75246f326c48115cc83378c4a0566672358559a3a37b18edf1efd11d177741cbb8d15844e1b1c3854ea148e9
 EBUILD vdrsymbols-ttf-20100612.ebuild 554 BLAKE2B 5a9bcbabc2211cf3595b740ac5dfcf234b0d4c0536a15aa7b7f988072783e959ebec91313998f2756d661314fb5dac79bd0013075b6f32d945cbb6d51c67d636 SHA512 e4c00f3deee2eafbc6402f8dd4bf77f72e15c794418cc393e709cea79baaa46961db4fe354ba7ac44d1a13c0e71168d3b78fc7f2e0bffc714a91b53550334408
-MISC metadata.xml 250 BLAKE2B 85787781bee26099abdc6b9035c66df92026cff1b418979513ea9e220d33698b803a452c9bf551802f4b2cfa1fb4f8cc978e7222f1cc3f469c9612f25ce6adea SHA512 e4b8dc67ce23a9e4ff2ef8dd02e7dec6409c2c3aab0ac4a59792438bbe546f694dd3ab6610467daf98c9968d03299674232ea130f472869d63c0b1dc2b82bc9e
+MISC metadata.xml 274 BLAKE2B dbc56053538593fa099c0be13d07388c106eaa52bb3e23d9360d49d39ffaaf7d03fee7c555fb028918ec42b64e7bfd02e0aac2b727648b546b446c49bcc66ba9 SHA512 9058e6c5dbf628f01b383e99f03f1d735d18f9728f3e6cb53abc7bcb9f536db1b60ef7251f60a7081b88218fea25375304efdd35d23c1e9eda5010d9fcfd7f19
diff --git a/media-fonts/vdrsymbols-ttf/metadata.xml b/media-fonts/vdrsymbols-ttf/metadata.xml
index 2b167a7461de..b004e2a6fe4b 100644
--- a/media-fonts/vdrsymbols-ttf/metadata.xml
+++ b/media-fonts/vdrsymbols-ttf/metadata.xml
@@ -5,4 +5,5 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/viga/Manifest b/media-fonts/viga/Manifest
index 0ce4053a9edf..8eb6991d4367 100644
--- a/media-fonts/viga/Manifest
+++ b/media-fonts/viga/Manifest
@@ -1,3 +1,3 @@
 DIST viga-1.tar.xz 18584 BLAKE2B 25ba19e324ab3d39ebb376e4511a61df46307281c09241eb30f3c6a2399c0ed0e459848e5cb76ecd2a00336d57e3793f7412e075aa5cb6c99428587b01430502 SHA512 cff4b5e1dd8035238b5a83878789ebfb490f61ffdd0c20d752b25985346de2c4ba88747ba11a196ead03460ee8b70fbbb68154f7415a63e82a2bf16847947dc6
 EBUILD viga-1.ebuild 403 BLAKE2B 63cd97869461982809619d482684f4fc3a24534695f828635bef35d24bab2fbaed48b8b5f65010387ca567ce26d9582aa7b2a8ef9cf9b788cea5909c4509f20f SHA512 efb5b33279674ea0da9d1418c908bad03b69ca331da5d9d8b1646f546190c4e182fd22d97a0e36c8478ae5e178a6958f5e4a299190b45610efee23c952af2312
-MISC metadata.xml 245 BLAKE2B 8b37eb10958c42151bc0803181f1226364cf9149938fd549167fa787e1e15aba0d7be73b7ac50e0c8e531e2f2b6bdbb6ee3a13030e6049526c1ca88814a9cb34 SHA512 1d1a1994f0635860f199c491f84cb42e974e3b501b0bf118f6efbd520f08334ecee247baff08d3a08023d348f3c9345ede4668d75ef2ade6a436768a6b327c99
+MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/media-fonts/viga/metadata.xml b/media-fonts/viga/metadata.xml
index 36adbadb05ec..9448af9c5670 100644
--- a/media-fonts/viga/metadata.xml
+++ b/media-fonts/viga/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/vollkorn/Manifest b/media-fonts/vollkorn/Manifest
index d07ef13c3a6b..0a9a10aeeb44 100644
--- a/media-fonts/vollkorn/Manifest
+++ b/media-fonts/vollkorn/Manifest
@@ -2,4 +2,4 @@ DIST Vollkorn-2.1.zip 139737 BLAKE2B 5aa31eb1b7e493b273e7623eb22d99b629f5c044ae1
 DIST vollkorn-4-105.zip 11046213 BLAKE2B bfa8515335ab6f7eaa57ad03642b7694b41047b228e9c1c51285ac70f8d799a9d61ba0414bc91ec1fdb5e579597a8a3d5c901c1d77d1de1c425ba1822a29ced9 SHA512 847196951f842481d11d76304435f88190608cabd7ccb47ca19a10b7215b69e19c19dc85e628e6b2730dd9b8cf1850c6b30470103724dd40fcf9b5eadb88a3f8
 EBUILD vollkorn-2.1.ebuild 585 BLAKE2B 89c5949980a023119609c1e8e0bc88f17513ac9127421e28543102657f791e2aae913e63f2cacd51cca7908ec2d791bfa8ce3199676ce0d7b0729e7028a81b12 SHA512 fdf0a207513aa5f143b28081b16a2ce1eb89784c3fa115ae1fbf44ba76a760aa0136088a6b951f9a02ca2668a25b90c3df783655bed3e0d9f99ab49aa073a9fe
 EBUILD vollkorn-4.105.ebuild 777 BLAKE2B 6f0395650b562a97e718fa394f06b9a239d34fde720ac728a254dcaad836cbc5f56ad798015f0e49315c52633c535b5845e4ad00756f2852bfacedd7ae9fcb0d SHA512 c30d90e4605e937bba7934a0474ca9554715290a5cd5d7294dd8ce4825b21af0018293749bd09e39194bcdafa951060d714a0d83a891b15f605d4c477df4bf21
-MISC metadata.xml 470 BLAKE2B 83e993f3ad3b5c07184373535640408bf5c9cf85ceed425adefc7f4c887d9e5ca473a5f2749815f66dbbc78e8a88b04ade3c1be0e0aa8409842b0bec37fdf7b0 SHA512 29f8aeb86eed59dae79ca6f124ee197d0dd0ea7ec60a0b35e71b8a832aeea71d13529803900c0286cdf5f426ddd55a01777f161fa8d3995333272997ced53fc6
+MISC metadata.xml 505 BLAKE2B a1f71405075575567e70566a92f1a3f90334f8bd717ac27a37b1592c579a4f73268c9b63718eabfc0b7cecde2e9613b0fb6434c81387f26dbce790c16fa041f3 SHA512 b023c9f96fdc5cc2e25f648c6c7736008766331882ba7e4b15d2ad84088fe706a60aa1c976e6d53b3a1878951ec5a8ca5f075c7a9e8acba24064f29d2b7928c3
diff --git a/media-fonts/vollkorn/metadata.xml b/media-fonts/vollkorn/metadata.xml
index 9c5f2fa2bea6..da665b3ad41d 100644
--- a/media-fonts/vollkorn/metadata.xml
+++ b/media-fonts/vollkorn/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-<use>
-	<flag name="otf">Install the OpenType version of the font</flag>
-	<flag name="ttf">Install the TrueType version of the font</flag>
-</use>
-<upstream>
-	<remote-id type="github">FAlthausen/Vollkorn-Typeface</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<use>
+		<flag name="otf">Install the OpenType version of the font</flag>
+		<flag name="ttf">Install the TrueType version of the font</flag>
+	</use>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">FAlthausen/Vollkorn-Typeface</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/webby-fonts/Manifest b/media-fonts/webby-fonts/Manifest
index 259831660da7..11fd256ff587 100644
--- a/media-fonts/webby-fonts/Manifest
+++ b/media-fonts/webby-fonts/Manifest
@@ -1,3 +1,3 @@
 DIST webby-fonts-1.tar.bz2 7915 BLAKE2B af914cf3132a808acfcba204072807dff5113b4d413c5609d0b68735651bd76f34f1e2fcb6d1afa19af0c9693604ed101db842cc3ed5c2b69d0c153729c68a7a SHA512 5ab4b1ced4937429cda2c4d18892a781048bed0fba74e158868df113712536620af2de244326af80d79526fd4299f7671a348c11831c2a4f231390e5f68759d4
 EBUILD webby-fonts-1.ebuild 408 BLAKE2B 45b053eeb19c164de913ddad81aefba07f7a1c19c8617acb09d805b40beb070d6d78e7a38c6cae0da5657dbe549d6b14bc205aa40f1a1599159893780d905572 SHA512 3e61060ba2aa8ce203da18cc410f41c36b45f6d4fce536d835209e392c92a6f0a4e37ca58db9908d3bc863bb1ea49a65909989c8e98408a551735e271024ea20
-MISC metadata.xml 245 BLAKE2B 8b37eb10958c42151bc0803181f1226364cf9149938fd549167fa787e1e15aba0d7be73b7ac50e0c8e531e2f2b6bdbb6ee3a13030e6049526c1ca88814a9cb34 SHA512 1d1a1994f0635860f199c491f84cb42e974e3b501b0bf118f6efbd520f08334ecee247baff08d3a08023d348f3c9345ede4668d75ef2ade6a436768a6b327c99
+MISC metadata.xml 263 BLAKE2B 0b50fbf82dc925c031f1c1fe78929960b5aa70f4ec80bdd34cec9017ac9f07f9a3960421fe5a6a7f9b728c89570aed37fc1460c3f300da751794f1e527079db3 SHA512 a1d548b6228cd790b0b5147752c5495017391cfec3065bd6ea8ee5f8e1f86905220f6b764e71531627323a29d1218b60d36b6b23e9ca585775df12c260a6b311
diff --git a/media-fonts/webby-fonts/metadata.xml b/media-fonts/webby-fonts/metadata.xml
index 36adbadb05ec..9448af9c5670 100644
--- a/media-fonts/webby-fonts/metadata.xml
+++ b/media-fonts/webby-fonts/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>fonts@gentoo.org</email>
-    <name>Fonts</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-fonts/wqy-bitmapfont/Manifest b/media-fonts/wqy-bitmapfont/Manifest
index fe89970fcbd0..8ae61e8bcaa3 100644
--- a/media-fonts/wqy-bitmapfont/Manifest
+++ b/media-fonts/wqy-bitmapfont/Manifest
@@ -1,3 +1,3 @@
 DIST wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz 4041184 BLAKE2B 63103b63f17a1e9018093f0346a0aa8bc89804b2fa919e797b0716343abec743ab87431c35c2ea26f63a2544820e316e1e5b9663bb7d49da327e7b0ddb9270a8 SHA512 190c726e79c43be90b5620b3f5892e8cb7a11085a06180dbadb2d56208f1813bf7b0909deb035957cec5bd6fdb5d5f049aaea46f8f26fbc9f5d43d835c1349e3
 EBUILD wqy-bitmapfont-1.0.0_rc1.ebuild 559 BLAKE2B 594089356406fb5d0b8083c421a6a43e5efd5d3adc9ae50cfb9bc8df13c9d29d7dcc6cc65c63f2d31d8f540cb97d3fa99e7ca47d3b64139f4ccd8fe72ce73ed8 SHA512 90b62bcdf3e2913291151afd93adb5051acb99c2a8a7f23464d10ae94a8752d115c246a5a71a47cba6cc5e63d4a779d3a699a63d4553ed2406e8c5b335690060
-MISC metadata.xml 830 BLAKE2B 1fe05213d72f8d1e1a630f1b3ba340245821b46dec4f4fe5be1871a766fd0018ee612b94c1ecb50af04df563d2b60ecbe616c5bcacd31183df3bd94d762d1f4f SHA512 92c910f75de5f49fc3461a98ef34303707f1db096a46ee8fa804b47c7db9007ef6029c01b97a218e4003a5aef86457108afb0f13bb8a31beb7bcc65f5725d72b
+MISC metadata.xml 854 BLAKE2B 12cb75696648261ab5d07c95713f781f027dce16f839297a7b8f2cb7b98175d1678600757cd69ca4deb04cbf5d9afc61e673298a493ea42ade64275972531f5c SHA512 4a68ad162309d13bbfdaec0d28dafafd8368f4c59d42085a5c2ac385f7fb096b3cce3bc455747649bd936fdf19d21e740f3c91ecb0095e6665c99346b0640ba1
diff --git a/media-fonts/wqy-bitmapfont/metadata.xml b/media-fonts/wqy-bitmapfont/metadata.xml
index b0eebf22745e..26542144c468 100644
--- a/media-fonts/wqy-bitmapfont/metadata.xml
+++ b/media-fonts/wqy-bitmapfont/metadata.xml
@@ -9,6 +9,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription>
 WenQuanYi project intends to provide the open-source community with the most
 complete, standard compliant, high-quality Chinese fonts and resources. TrueType
diff --git a/media-fonts/wqy-zenhei/Manifest b/media-fonts/wqy-zenhei/Manifest
index d92d1a9e1131..4b7eaa6089bc 100644
--- a/media-fonts/wqy-zenhei/Manifest
+++ b/media-fonts/wqy-zenhei/Manifest
@@ -1,4 +1,4 @@
 AUX 44-wqy-zenhei.conf.patch 1837 BLAKE2B ff744221a614846e63ea3fa5caac11047c8bd9ead2bb46f9d048e69ac26661cd954811eefbc1eaccad8165177915cc34b3ef55869ef5c18c8817d8c892c0dce8 SHA512 0f5bb12f782836b20423515792c14ca9a354b411e33d6c8fd390d0cfc983a734e5426e47d0b0cf063aaba3a92f9b3b48b4bf4498d23662012aa9077b43293c4e
 DIST wqy-zenhei-0.9.46-May.tar.bz2 8665887 BLAKE2B 5cbbaccb155f337dc9187c0c4a8f8f0d2d1c452ab960df7797ecc2b339d5c9f23747e9935db3d190c5eccbc8739888c86c4a7e0a01c7e33b76256dd92c301836 SHA512 ff41473fc9bd69c04cc509d1f8915d5bcf99d175ed9dfd2f9627fd56f6a4e7720e4930d35313d1e89f090b229f2e3f461c948046257fadee192dd618471f7833
 EBUILD wqy-zenhei-0.9.46.ebuild 1159 BLAKE2B ed0b76f8468fbc8f3c13275c1fc83fe37607a478ac675582290ae3d5d5a5204413bbab1b5f36349a38c86887ad370680b69fe7034160315aee2a231597896de9 SHA512 251b5d1a252429d3a9de1910c349ed67cf8a6b2a673f2215dc172802f9c59fa8c919c78461898ffd3636736c7beaa91e82659cbccab6c6132caf15cc514218c0
-MISC metadata.xml 312 BLAKE2B 91ec303cabbe49b5f517a1eaf9f8af7d9cb4cc8bba9c79a3b6827bcb123dcdf4ffda78abacd38cbd27f85cfcd94a407f35c03e6577a7c05cd54c05b087bc372b SHA512 2d82c9348e44f9be607bc5d6045d029714167b24a2111edbbafcd7a22be6bc9b48e9be7531ab4b429db471a947cfe1bfaefbaae8ef76d1f8e908b7ac1edbb63f
+MISC metadata.xml 336 BLAKE2B 86dc69a72fd02f1e0b4d44d126a6492dba0ca830e97f39d1353465e2f67a7e978ba75704d4edefa0db964727b0c72b15f32521fcaed6d72c9a5a38ebfefdac8e SHA512 d7899c72b954827b76747559cb530b9d6ba408fba32d520acca560ba6df808e4066e7e103239d7e2e8cb383198e0113c5d8bebc4e80aba96e4d47b92f92d8ff9
diff --git a/media-fonts/wqy-zenhei/metadata.xml b/media-fonts/wqy-zenhei/metadata.xml
index a1ca15230113..b689c872866d 100644
--- a/media-fonts/wqy-zenhei/metadata.xml
+++ b/media-fonts/wqy-zenhei/metadata.xml
@@ -5,6 +5,7 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">wqy</remote-id>
 	</upstream>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b74aefbe2a07..07f6e4c3077c 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index cbbb6e1dea2c..b1700d280ba8 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,5 +1,5 @@
 DIST gifsicle-1.92.tar.gz 575199 BLAKE2B 53716621846b14c0727e05893cb1876572ab80aa4d444c2b75499b541a19a5e45738b817c203b3926301378b2211a3263311c424cd8dd53e71d2b60f28ecdfb3 SHA512 5d9539eb5a6a8b87aed49ff3ca3d62e337845edbd05459b002369d571f74878c99740c34f50b4c86e5b8787ff189d4c21230e4f9019cd96a09db603afd7563dc
 DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3
 EBUILD gifsicle-1.92.ebuild 650 BLAKE2B 0d9ff8115ef3c7b970fce293ebe3c7ac2d59064885e8aa4f5289652d02234c4772406a0e650305c783aa408926db6fe37a1c3c3cf3f221d6e7d88a7a30cf28f3 SHA512 eb99c7394bf33c104412f73c9e3c2b08564c0ad9164e26484c8f8530064d0a2780ef7c4690e764bef942be600118b605f8d5890c16fd9708fec23499c567666c
-EBUILD gifsicle-1.93.ebuild 640 BLAKE2B aa68efd88e3029c3bad2f75d4c6454bee5205854753d4167e7cd9d02141d244f3f19084d6260b8b84af16673d935a1b9a214b135beed6464c3c26469db65811e SHA512 314e91941b4780269156755b2fe92791f41a2ac98ddeb8d462ff1a4cd81dbd9cdab5557892e387d1dfa75284c169020cc3c20c1efc8d352c9ceb476b42b04d32
+EBUILD gifsicle-1.93.ebuild 639 BLAKE2B 9c8080193dfaf712da47ac9855142d171861e9568849065e30f03fcc6be0318afc62708f3b3795ba49ef0facc375c77f269a6da2915d055d7f85fca2dec683a1 SHA512 cd058a074484f0aab0730acc8b09b79443e8db055d3f0429279fb0f519cbfb1ea4620209fffaf5a2d0d30e2f44c057be7cb36214cf63afd1274c20c616928a2e
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/gifsicle/gifsicle-1.93.ebuild b/media-gfx/gifsicle/gifsicle-1.93.ebuild
index c8b8b6d8113d..7e6ed5347c40 100644
--- a/media-gfx/gifsicle/gifsicle-1.93.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.93.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 5d071a26140c..b597e9321b2b 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -22,5 +22,5 @@ DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
 EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
-EBUILD iscan-3.65.0.ebuild 2899 BLAKE2B cd559e4c31210618297d7a70f4713a8b9d806f80eb20f508b1af1e27a4abb03755edc9654fbf8b0c835f5f41b72a4ce3e3d4a2592d1c7c1d5ce08200793b21b1 SHA512 b5a93e50d29d8a3ed3d85377affc23a3710a0e7392a7e15025ecde99969f544699a6d35a1efcc4f7515e59b51444010289a7a0f85e4a834fb48a4c43968d218d
+EBUILD iscan-3.65.0.ebuild 2898 BLAKE2B 3a21f260a47ada35cbd8367bd4e0a9696ab62716ddeb3a7ed39f9d0ef846d307402713b38ac6df18c153ec0d9c5a30814d396ed02a1996f5ae1491cc82118492 SHA512 c3a905daac7976c6f387407651b9a7ebd0cf265b06720582225580601293226f5c01ed080d9480989372b79e3da958134361378cce12c2325a9419f3c3013e3a
 MISC metadata.xml 961 BLAKE2B b9c6fb04e94844fb8e7f1d60c5287809c61c3f642f86f55e88ba09a489ebe2b90a698b8a7f5d7c04d38324b97d746f68004c662839862f84a3d1e66cd56c998e SHA512 93c00c3fd4b23cab80f46e3f2a8bedaf92e97473fbdcc707034d86a01ff11269fe6a67648e7a369d71fd60e31d902bc8c94510b37c293df90934a6b2b38cf7f1
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index f143a5474646..d33a5f40eeb2 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagesca
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="graphicsmagick gui test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest
index 5ab9aeae172c..aeb3e4353102 100644
--- a/media-gfx/mkbold-mkitalic/Manifest
+++ b/media-gfx/mkbold-mkitalic/Manifest
@@ -1,3 +1,3 @@
 DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345
-EBUILD mkbold-mkitalic-0.11.ebuild 745 BLAKE2B 7577daa8e7c7620367cf2b9036d32d62b3b8b3a22e1626c9124e8d3e3e575ee65e59173388b38655831fca780460b738a3ea5d546917d6de8a593b80e2cf9ae2 SHA512 3321b4f69ca24ad9df50bd5efa76d6b2ac7a79c9c78c801ab8c54d2b53c5138c7dfc79cc3d240d04b54afaddd17d44bf2c4bef75aa30d96d32e130bb73e9a81a
+EBUILD mkbold-mkitalic-0.11.ebuild 742 BLAKE2B c9aeb5020e9d5ef0501f4905e343070be38ebd79635aac7bbee5768aa1a0612519d017c254e718ad51375c5c0bd9db6784ce472ec346bd8e7463026d3f96061b SHA512 6470a9b865aebf0fcf06d188a687b9c5542425932d6fed2844313c065414e52411f61bd077c3a2b0d0cb4a27f33a966a425413592432af5baaa6c9287bab4620
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
index 26a687302657..a89795088ecc 100644
--- a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
+++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~s390 ~sparc ~x86"
 
 DEPEND=""
 RDEPEND=""
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 3bb34cd43696..f2ebdc8d779c 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -5,5 +5,5 @@ AUX povray-3.7.0.0-user-conf.patch 1491 BLAKE2B ee99672c70a5d7e12048acbfc50a3ef4
 AUX povray-3.7.0_rc6-darwin-defaults.patch 920 BLAKE2B 9cffcda18626cfdbea9a6b00ae99ee300d6b29a79e22229e35d116070b4a1ac1fbb4869242a043155a4fa189f701e6bc318cd3ba8fbc743d497db26c763926c8 SHA512 17ae635430f0d57157c9915ce5b25a88afcb34f6dd9552b27a42b32d638fdfbcb8b4e41ec89b52048db9d054812535b7b41f328ffe4554e719e4a3de21cbfdee
 DIST povray-3.7.0.0.tar.gz 38191521 BLAKE2B 5d936bdcdf9910ede2247cfa5e3881211da00762ac4bc08225dc6b53addc9e09546de9493e642b5d41228d81a50a4bcfbb5e606eb8bd9a224bb1afc5fc82db6e SHA512 82e3dbcd58b7ae921fe3b953815ca4dbbfb22eda434554baee4accabd1455b18cb511061f1cf9cf93128fab0a042df374fe2f68186d78c19853a465bd4bcbe10
 DIST povray-3.7.0.0_p20160914-fix-c++14.patch.bz2 12876 BLAKE2B b1c458764f04a57420a4562e9faacae4ae955c3d9ce4343ffd49176bb575f63830fcd58d0777dea22b975df118aa14e2bdd91509758d33d659daa3fbbaba5880 SHA512 3329da12a822762559445e208a746ff208c39f7b63e27ba84a390074bb52a105c9a2f66180e58c5157795bb16346e11b5b05efaf077ee0d8246179975a692b04
-EBUILD povray-3.7.0.0-r1.ebuild 4611 BLAKE2B 83dec3e35bfdeff46ec156f9c746fcca4c86608bf00344ff290ba1ebf9786812db0777a9f4cd2c0de760350fc95c8d8da62e12f5f407fae339bfb21b92a400e2 SHA512 70f40fabf0e3a04b4bc978ee4976cd673745b90d7061397bb7027f4115277678182b633af938ce8015e7356ca5da8b65bf9abf95cd89e3a95a04883061c8fc17
+EBUILD povray-3.7.0.0-r1.ebuild 4583 BLAKE2B 0c44090841e9a6b22b4c9b89c161bbfbe0e4bd080e49a6d0bcbc14a177a565a5b45984661b66b428af3070e714eaca1e7d4c15c28e86ef44b76cee487ab46736 SHA512 e9ae09577410ecb5dc6f3eb68dae1e231fa118b180a6c737b612d6827c7e9c3cdcdb48a30b59e715265d142cc00992b4adf095bcfddd7d2a91e041b24312fec2
 MISC metadata.xml 410 BLAKE2B e2d166cc7ed5872c7e0bdcf69c7856bd8218b059e9b0444a68930216c423ef7c8922ad963cfc3dc56f0d997c1a6372a04058815eb2b36487d07dbc6752908e2d SHA512 c159e2c730bba95d7c65525d62af05bd5b9d873a519e734010a8e5bc597590147accfe02e23946f0349c0be31a10b3e578d035bc3ff8d11a11274c1957a834be
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index f6193beca6b2..5eab9b2b5c70 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug +io-restrictions openexr static-libs tiff X"
+IUSE="debug +io-restrictions openexr tiff X"
 
 DEPEND="
 	>=dev-libs/boost-1.50.0:=[threads(+)]
@@ -112,11 +112,11 @@ src_configure() {
 		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
 		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
 		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
-		$(use_enable static-libs static) \
 		$(usex tiff "" "NON_REDISTRIBUTABLE_BUILD=yes") \
 		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--without-libmkl \
 		--disable-pipe \
+		--disable-static \
 		--disable-strip \
 		--disable-optimiz \
 		--disable-optimiz-arch
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index def00da4536d..6b117ee8cebb 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 608915955849..9be4e117626d 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -2,6 +2,8 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a
 AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
 DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
+DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
 EBUILD alsa-lib-1.2.4.ebuild 2183 BLAKE2B 0ae13b0987dc0f55b08b2cc7e6bf565acc782469e7502512b4bafc6cd7ebf80ce54dbbd492cd3d11e8bac04f00d3df50777f92504bf482a8bd03086162d58459 SHA512 68e17a8e334f955cc403386f0e430d07ea9c116c21450fbdf4d071e68e260bfe6189ae612fa4b5efd88d4562885ab84824faa210d5736b7879e36e0dcb9de979
 EBUILD alsa-lib-1.2.5.1.ebuild 2511 BLAKE2B 431c692b5ae0ffca98f1100e34abfb64bc93a38a0faba2486c676a21482d156834d766252283f7f689ca8ceda3dc7294f7acc7ef52e4eafe983a7bdbc5cad5d6 SHA512 762f28d5fb7e082f0c3117532aa88f4da0f60a939514ca441cbcb6c48026572a7b85a934eccb27058dbd412356a5a66f615328c4b13fe759c3f9ac46107937d8
+EBUILD alsa-lib-1.2.6.ebuild 2511 BLAKE2B 2adb52258bd8023fb8f3e78f62b1882cfa3bff008a59c482091dea745bdaa33ad4e8494581dcc6fd2f6c5d1072eaab21f5dd36d1dae6d4c5ab66dc00c2a50fb8 SHA512 cd8f1dd437a86241142040b762c7871035725e7685fc076635a87d802507d86a27ce6a3f6fd52d969c550bd5c1418885ea2c44392b1d5cb1b1dd6926127c89b6
 MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
new file mode 100644
index 000000000000..1b9c1819ad93
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ ${PV} == *_p* ]] ; then
+	# Please set correct commit ID for a snapshot release!!!
+	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	media-libs/alsa-topology-conf
+	media-libs/alsa-ucm-conf
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	if use elibc_uclibc ; then
+		sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
+	fi
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::" || die
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
+	default
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index c94cdd11f4a4..ecdc056420d1 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,7 @@
 DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
 DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
+DIST alsa-ucm-conf-1.2.6.tar.bz2 27309 BLAKE2B 4f1f0ff361d11775799a215ffbd85acc229fb25e9e65321147e942ec5168997780003686a98f3d49dadd11cebc3156812d01ebcac385b0b7bbbbcbab78745951 SHA512 5fe85643b60c8defeafcdfcf97e61b5d05e6db28cef2466a70f63b8fffba22bdd50b83a5ca88806a6350de6e9d802dd3c2240b293190b9d05daea515c03d4397
 EBUILD alsa-ucm-conf-1.2.4.ebuild 504 BLAKE2B 84cbca14794d2060a35db13528fd65f694508771bce1c9e75bafe50e437472f2f3bd33365286526b9f3dc2c4ae70fa199fb08f8d37ef0f9fb2bb9d031763fff3 SHA512 1a3f3b2189b0a198720b84fe730386f285abd8b628ff52dc682813d55f375ee4e37cde4e164bc82738c4b15585e113ffcff29307f0dd057fc6bef2d6c4e09d5b
 EBUILD alsa-ucm-conf-1.2.5.1.ebuild 518 BLAKE2B ec4d80331565113f921b711d4a1d501ff189b614d92989eaa120c480dbbf2e1ad181eeaea6fb696a4d184e20b2602fc7122b1e4e1d4a135f97b4b0b3abb93712 SHA512 76d07e86b7d9af05646ff92ceddce0e10c8cf3bf0c1a0cb6a3645db259c5c2c93c9fe330278a0b6d4dbf8faf40aea31abe7a8c2f50d8dc0723c4f52bc5651944
+EBUILD alsa-ucm-conf-1.2.6.ebuild 518 BLAKE2B 3d13771958e9bec9e2c4f67661f9fe6534145fc0fd0ed92c8052dac55d370a4cd1c1f615f5ec4ad4846f4cc112d5d55259f9b322858024770d1f4b4252e866fb SHA512 17b1549906eb2d572d8d094e9ae2e92b1155da03e86cf5829612b2c2b5db9a02ae06564ca70de5e354364ec7cdeb34b8f69b7ea40e48d0764a52585045c6f6f3
 MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild
new file mode 100644
index 000000000000..fc541a8256d6
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index f50a23825c8f..ecc0831d4422 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,7 +1,5 @@
-DIST hamlib-4.2.tar.gz 2311775 BLAKE2B 4fe8d3e6d489369aede1a4cd59f01be44a7787ca71c21c5b92d436666c67de68013f488834d0f57238e6a947c24cd5b4c6c667397dec30392f1cccd695df252e SHA512 08ccf4e592fbae938ae1aaa5afede7e2e6ec7d23b449a65b00e093502f4aeb36930624f055d9802349f77df9dd2b7b983aa44d83f8c62a6de5789e7df627f804
 DIST hamlib-4.3.1.tar.gz 2356944 BLAKE2B c803d253c867303cbde98b6f2e10f610aac111b7bd81fd343e1396cb86384b1c26942e5ccb8e395e073f9aa3d48e6f9edc1b64da14b2ec5ca09f98fbd3dee667 SHA512 8dee4676a19de7ac1ef733a4285b76e918f11aad6594d0557d36df295faf04c615e0993edb2f9ed5e7aea718c184603fec831caf28b75026c705f0b2e4b9eca7
 DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-EBUILD hamlib-4.2.ebuild 2059 BLAKE2B bf20a9cf50751f9c569838e4e8e23a9f88b5fe2c2b8768c7dca910b7bd9e6f65ea5f81dda22df0e4aaf2c4e8851b179a184594a6a88debb53f7e2c1a2945560f SHA512 3d6caa23d7cf43e9744eb88aaee4ec978331bb02dedee767ddcdce81a7f02419a34f2bec2ffd91dd0757e934af4903879ad3485b70784aace027340ceebd4002
 EBUILD hamlib-4.3.1.ebuild 2087 BLAKE2B f9bcfec7f4c00bd47e11aef68fb7c654ef4aba2989f25a1b1092766e7fca445d5c24047e240ac65ab359432b9aa32d6d6b0fea54e2659e515280fb840def7ddf SHA512 759eecc58675fe9899cd50d5ec1fda46a61e328c91eeb6e4ede7a02d3000ed07b07e4d42e9c09e35db11cad56f757aa710cc4ae070f1c3a10a98301021d71f80
 EBUILD hamlib-4.4.ebuild 2089 BLAKE2B d4ef76d3358a875118c9bd3f9cd53e7f752ee00b0852ade92e7d2ac41fdd8baf5eb2307abe78912d9ec6b72bad0d80eb9b42696995c7685b33fa7504e3b9bc06 SHA512 404b570ff55fcd7ba41cf34a7a429354519dd847c43cfa72cc5b581ffbbd0fb76b4605959242f3d82c500ea8707601a71e45553d07512cf6c8bae7c90d02823f
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/hamlib-4.2.ebuild b/media-libs/hamlib/hamlib-4.2.ebuild
deleted file mode 100644
index c26283d90ea6..000000000000
--- a/media-libs/hamlib/hamlib-4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="https://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="amd64 x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a41147f05a3e..3c851b63213e 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,7 +1,5 @@
-DIST harfbuzz-2.9.1.tar.gz 19154048 BLAKE2B e6cdc3936606e3d9a4bacf385db13c54f328d5be6c20ab20f844650351dd34f8f2015954f4ac7a6e0b8a1258ed9a6e71f43871c768c892d87af5c399c4499c63 SHA512 f8bb1d75b498d1581e76c57e5a15999e2c0d745d7d73dad17bfc91daf000f96d17c4924e6fb31270c90c26693dd504a7e7b2add152a013acca2491a86256b07b
 DIST harfbuzz-3.1.1.tar.gz 24966288 BLAKE2B f655d6a175dc495c00a76838d101705a32270668b7d989b8e82b9c34d2c16a5c10d210c0ed99a334515f73f7cad5c22e35c97f3a2c3f40f686380dd0559d0d7f SHA512 ccb1c840d07e28871893c40b2bb687cc78dfd25992ee20192f1faf8cae4356f401abd5947d7480a268edea10dd9f1d1d7e113b29b6e2d958220bf53799ae01b0
 DIST harfbuzz-3.1.2.tar.gz 26678706 BLAKE2B 231687fa77983217cf60eda2b4796431c15a9efa79e8925363e6d8374ea2710d167eb1bcf5e14a7c738a98f6be06e24ee6b038ea5697b380b81425c9d4244dad SHA512 4d1093904bd450c6d65130b3d7198c07cfc5cce9a5d234fcb14bae1101b28e697ba42cb455217f863d8d5c83830784f716ae59a2dbb38e88156677213bdb4799
-EBUILD harfbuzz-2.9.1.ebuild 2505 BLAKE2B 1de2fdb70f4647273658b95cf2425c7c94d56d55c695d4df4b94b4c375d5dad50a04e2f279443061e721c19102345832d3be84cb857f9713e7ab9660e0ab3d82 SHA512 ed1bc1b2870766467bf808aa277c5db7fcda334e610378b84e739646c22cc71e810c6ad051abb0d4bb93af10a74be672b552054719a29979e653131ad4af4070
 EBUILD harfbuzz-3.1.1.ebuild 2562 BLAKE2B 850d12ca96d06beb855e02816d5d4fb68e76a70004e4cfee848115ec77045171cd042872b8c7fd5083dce0809d298ebd887ce745b0cda8befd2bc68cc00ff58d SHA512 ac6d67696f14848dc2ae0ab25938a970142ab2009b519ac55e83e0e0fcfdea2d4478a752ef4e2836588db9db1fa9725226b80885ef248509849a0c33b679f23d
 EBUILD harfbuzz-3.1.2.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
 EBUILD harfbuzz-9999.ebuild 2570 BLAKE2B 5df3f3bec5fdc10f651804c0fba6cb2b0c0e88045585edee823d58f3ba8473b81e2788274cf4739b36b92f0bcdf7b0079b38038787014ce32e441adade6496a3 SHA512 1deb1e8dd62a12965d391e094e8bd363ea5c1cfc5305eaed275439dd3073e44f2b44606c9969c5475352d2034ce9b2339cf1a7ba6dd0310a6bb5ff7484c16470
diff --git a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
deleted file mode 100644
index e446315ae37a..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i \
-		-e '/tests\/macos\.tests/d' \
-		test/shape/data/in-house/Makefile.sources \
-		|| die # bug 726120
-
-	# bug 618772
-	append-cxxflags -std=c++14
-
-	# bug 790359
-	filter-flags -fexceptions -fthreadsafe-statics
-
-	# bug 762415
-	local pyscript
-	for pyscript in $(find -type f -name "*.py") ; do
-		python_fix_shebang -q "${pyscript}"
-	done
-}
-
-multilib_src_configure() {
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	local emesonargs=(
-		-Dcoretext="disabled"
-		-Dchafa="disabled"
-
-		$(meson_feature glib)
-		$(meson_feature graphite)
-		$(meson_feature icu)
-		$(meson_feature introspection gobject)
-		$(meson_feature test tests)
-		$(meson_feature truetype freetype)
-
-		$(meson_native_use_feature cairo)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_use_feature introspection)
-
-		$(meson_use experimental experimental_api)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index afd2fc5a3f0b..e9929b8a518d 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -5,5 +5,5 @@ AUX lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch 936 BLAKE2B
 DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
 DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
 EBUILD lib3mf-2.1.1-r1.ebuild 1422 BLAKE2B 2a5d1bba2b34e3aba7f8b852ed81af4056247e586ebad940d48cbf07d1b1e28b03ded6ed85c958eba45c0ee7d9b40368c57415c212b51862c92745accdf8e100 SHA512 86bd28c9587a9f081049e0fe839cd39b0dc45b7eb90e87b2494fb4855f27a056ca87b114a730160b16591c63bf75ead6229bd5305bfedb8d38ae21c3d5ce2278
-EBUILD lib3mf-2.2.0.ebuild 1472 BLAKE2B 0ffa5e0eb552551f994671482f6f68651b11ec6e8000b37cf52ce3b0d31504c9f18275ae64d0b3fedae9a783b9150cb051bd82d9ab82043c016ec61d9b82e076 SHA512 311745ea1923288031cf07096008bf53a913d8226d9da75d41365a963b9afcb87255a2bb45abe8661ab317a19f882392216a2ee033760c97e9985336623cd74a
+EBUILD lib3mf-2.2.0.ebuild 1471 BLAKE2B c0f87010353a92281a46af2798bb7eb74ffb3ef196d5f56cd05f36c9712efd5b7f92037bf4ad8e0966b23b269d6a1c1e3aa300ee2a2f138fd76bf05a04ec64eb SHA512 83037eccc8db148790fa4e950767bdc6bb8d4b01c04afc59ad059ba601142bb847bedc50651093f7fdc8347ef7a2a90ee969b22e70dc4db5d1a12d081c989c5d
 MISC metadata.xml 936 BLAKE2B 55b169d62c7b8e9ef8ab789c16a286ee545f6c5519833e9c27e23765fe279b059050f526b5ceb2c59eb63d8568348c403326ec5b5d2d9925728298f3875673e8 SHA512 dee8668538fab0a6ea13cce39c0b817d59ee4dca58fa3f15e1c7b995dbfbb2abe63e1ec27b5b47c7d40521daeffc1db4a357c3c9d07e39f60c9b8851066ad9fe
diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
index b610255ab76b..65a29e035e5e 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/lsp-plugins/Manifest b/media-libs/lsp-plugins/Manifest
index 1545194c82ee..de506d6dc47a 100644
--- a/media-libs/lsp-plugins/Manifest
+++ b/media-libs/lsp-plugins/Manifest
@@ -1,8 +1,9 @@
+AUX lsp-plugins-1.1.29_armv8a-dsp.patch 358 BLAKE2B 6c5ab9dfd52ff56d123f0684bb4a6d8f8c20e6919da6d07a95e1ad7eb419e53e16ad7231fa486b5f2a56a494f812eeba5bd92d2a57c71973c72f9045f48d39c0 SHA512 3ad935da3c1cc9d753a7f35d878c36cdbeb5bc922684547056a853b121b06ec2034bd63b45339f69ced1fd9b6c0da2fd22cb1bef77c4af1b79763d688b63fdee
 DIST lsp-plugins-1.1.22.tar.gz 61694018 BLAKE2B 5c14140af797624cf67d61618d22a006c4b02232cef92533244f36b108b58461c56c28379cbdefc8d967de34c3bae91450bc787a0e6ab2ae41f53e4e431a17ff SHA512 6004136b55a990033d22e60af6c418a5ee708aaf0f4263fc3af8097876f7eea6e125a44392468ed8e30a92c0fa44eb65f40d80b25a5f243d3fd4f1c0f3af70d6
 DIST lsp-plugins-1.1.24.tar.gz 63809276 BLAKE2B 3d623d4a5b21f2b4dbd7263805b50c9cd9bf19733aeab774983d7a79695015d1e30201f3de46dde950adadcced347f878a272c1c3da9c5f0721c6effda05d9b4 SHA512 20a82594aec51877255ca2808b6c8af03fcfc2f393fdbc6ae6826dd0da17c4a5cb14f02658c1f102600477d7d4d4fc9e24ee3c6a6ef704afc443499a43bd65ec
 DIST lsp-plugins-1.1.29.tar.gz 66143142 BLAKE2B 6fa6943d8cdf3aedc9f671c64b433ffd5c4f6c7ca14f6a75578300240971e7c9e8546b9a7df7a13b8cd6e0844724c064daa7e249aba70636f47a622e73ed264a SHA512 b8c3804ad583322bce414d6beb079afa5b98a111126bb4507642376fcf1f82b31525b4959c6388b02cc1d14e0ec25de3596794895f2860f492a5fbf87f6e88b7
 EBUILD lsp-plugins-1.1.22.ebuild 1037 BLAKE2B e3f7c25cfbd4938ee04bc88f3026b24ed254d6e6f68a4262dcca59e5f99ef61c91c16293763aa4e53c42633da9db7416947d36c2de4fffba6c0407c86de11e99 SHA512 2d8042b5a22dae0e3e9df23a639184562f3623789e44d1a02d58d3b8bde5b6d136e4e74874c0c3a5656ae28f108eb177ec295c03afcac5764281336b58c1e617
 EBUILD lsp-plugins-1.1.24.ebuild 1076 BLAKE2B 399febc0f6dc791d765d16c3455469eafe5a5ea76934b4475993d9758e3ce0a3c00540995e7719c94cdc849cd7dc7208fb86eff9094af139be70ae5625d1d184 SHA512 2dc5383e1da3ccaebf80a8a5edf092db87177a2590dbf7e96bfc1862ebd9a4567f1dbec95c2e35ec38c5603a2f5d691c67c6f4836bf0c568873b04483aeef0c6
-EBUILD lsp-plugins-1.1.29.ebuild 1087 BLAKE2B 87b54877d6cf206de8c5a05b413d20421105c689492c5f896aa3a672e1c7ea46a7e66c2e3e975b3222f748b0247c77b8748554e3b1575f59e88b127f79fe6e5a SHA512 8eb42cca80ad628dd0e1df1649b9bedcf2d3d7ac5bcefa768363af8b25f51ab978c0e98b6b3f399a90dc56dbf7ba91cd142ca0d5656d68da96cd1a7393f64eee
+EBUILD lsp-plugins-1.1.29.ebuild 1194 BLAKE2B 83b56149fdd0986128dd133068e0c4d231ed301f225528950099df6755505537b1315cb52289ff10b2c3a1defe6dc689d8b3222182e8f251e127871c8f48cc89 SHA512 184fa4511d7e62c81688d448a38ae51acc6220972afeab046ad2e671cff8aa113cd59d3c88d944d89f09a97c20cd3592d91cae5880bc798b5a4f641e622745f1
 EBUILD lsp-plugins-9999.ebuild 1065 BLAKE2B 57234488746b4b43a1b71b89491a74540646b074b13276ad84bde7398c02a2a2665197a953d2a5974f9eb4f9402585d7fa681e9f55fdb233ec6dc7d94d255ba3 SHA512 48b0fae3be3abe2c80cba542553886fb8e850694b00b1d3c7154466647ff2a20e4aa6eb466a8cdb4ddea4ad2371f7d2cb70319866e92fa958281df53913981e3
 MISC metadata.xml 493 BLAKE2B 47dabd860a13d087936716c74a42fbd7742a42d0068d0aeb52fcd3bf839cece378dae861caa091c2fc7096e679751a4d4ec1a6fd255830808129bc166b3e9a38 SHA512 34b04a4149a0da8be776d60bb67141ea87397e4346bd63f7e76be469eed0a2fb021d0bcdd025a1718b80dc3b4acfd4abb06ed846d9545e24262ecbb981d935e0
diff --git a/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
new file mode 100644
index 000000000000..2603b4c8a4c7
--- /dev/null
+++ b/media-libs/lsp-plugins/files/lsp-plugins-1.1.29_armv8a-dsp.patch
@@ -0,0 +1,12 @@
+--- a/src/dsp/Makefile
++++ b/src/dsp/Makefile
+@@ -44,6 +44,9 @@ endif
+ ifeq ($(BUILD_PROFILE), armv7ve)
+ LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
+ endif
++ifeq ($(BUILD_PROFILE), armv8a)
++LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
++endif
+ ifeq ($(BUILD_PROFILE), arm32)
+ LINK_OBJECTS           += $(ARM_IMPL) $(NEON_D32_IMPL)
+ endif
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
index 0247cef3a961..739dcd9932ed 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
@@ -20,8 +20,11 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="doc jack ladspa +lv2"
-REQUIRED_USE="|| ( jack ladspa lv2 )"
+IUSE="doc jack ladspa +lv2 test"
+REQUIRED_USE="|| ( jack ladspa lv2 )
+	test? ( jack )"
+
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/expat
@@ -41,6 +44,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.29_armv8a-dsp.patch
+)
+
 src_compile() {
 	use doc && MODULES+="doc"
 	use jack && MODULES+=" jack"
diff --git a/media-libs/quvi/Manifest b/media-libs/quvi/Manifest
deleted file mode 100644
index 0bfdc6c5efec..000000000000
--- a/media-libs/quvi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX quvi-0.9.1-automagic.patch 1586 BLAKE2B 59ed8c56bdcf3eb2b96a485be50396b8ca6d6432a402929bf877e2c932e35276bf452f8f453d1a00a3d051fda075b49e0138ced9cf8dde5c63ee53d50ac0434a SHA512 cc13530109553c4ebe652faa74e29ce159ef807eb24000b472434e1d3307b677cfbc5db20851041ab6cc4d024db84cd2a1a6ee91f9787880588fc692aafecc52
-AUX quvi-0.9.5-autoconf-2.70.patch 401 BLAKE2B cf0f73bd28ef391e6b0e0e30b7c10abf64ee7cdbaea1040c7c0439e8ebb9605e13854d17e2d3cdf582b5c658f15244ec6478acf7b5a1958347ebf79859e59ca7 SHA512 18f156dc970925c07b2922ff1ca79bc57384210d151b53bea8288e8ced32c1f1993b34be8b1fb7f570aa70317fb8c45549142082a83c9d52f026dee04bb4af94
-DIST quvi-0.9.5.tar.xz 316676 BLAKE2B f9d8aa9ffd1cc70b17c4ce77648bc46f178b5eb0faa238636bb702701d8a1f249fb3a56a0fa0f5840efcd53532609bdcc0010fd90163f4619746a196ab269267 SHA512 ef50160b7f2b6b8c9049eb995cb26da3100b10e7af8206d98d2e128cde300ceb05a24dded06d7d49c0e691fcc2de5a4c5c9e9f439d40ca52cd0a3a24330c6d79
-EBUILD quvi-0.9.5.ebuild 916 BLAKE2B cf7241d4241e431073dd2bab6f59d372a6fd9f394186b0aef22e90095c68b0f738ab8b2507b7e93e68bf4ec4f7c95da5bc98664194c5bf0f9bed97efe2644eeb SHA512 8d98c186305706156b27fc5a19617de5f035770e793bbbaa0e2df9c3701b9bc3eb28b4b465b66e8ff83a84d291656643589f18d3ff307b0ec418ff1bc99d8d86
-MISC metadata.xml 407 BLAKE2B 284d55a3ac47e99c204f2d2e5db3dbfabb8423583a1de848b87905bf6dd45451344f927f4864225712f91844b7cbf1dd79179ff962a123b4f6f56423a7d6fdf0 SHA512 9a2ae358a4ed024e609626579f39846f2eeea664ad2e809e0a88ee7046749591f95bf51f59c8c271699b14e4af03ffc3176c557f1144f87d386f3dbff89aec07
diff --git a/media-libs/quvi/files/quvi-0.9.1-automagic.patch b/media-libs/quvi/files/quvi-0.9.1-automagic.patch
deleted file mode 100644
index 0f011eb2fe7c..000000000000
--- a/media-libs/quvi/files/quvi-0.9.1-automagic.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- quvi-0.9.1/configure.ac
-+++ quvi-0.9.1/configure.ac
-@@ -54,22 +54,30 @@
- PKG_CHECK_MODULES([gobject], [gobject-2.0 >= 2.24])
- PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.24])
- 
--PKG_CHECK_MODULES([json_glib], [json-glib-1.0 >= 0.12],
--  [have_json_glib=yes
--   AC_DEFINE([HAVE_JSON_GLIB], [1], [Define to json-glib package])
--  ],
--  [have_json_glib=no
--   AC_MSG_NOTICE([json-glib 0.12+ not found, building without json output])
--  ])
-+AC_ARG_ENABLE([json],
-+  AS_HELP_STRING([--disable-json], [Disable support for JSON output]))
-+AS_IF([test "x$enable_json" != "xno"], [
-+  PKG_CHECK_MODULES([json_glib], [json-glib-1.0 >= 0.12],
-+    [have_json_glib=yes
-+     AC_DEFINE([HAVE_JSON_GLIB], [1], [Define to json-glib package])
-+    ],
-+    [have_json_glib=no
-+     AC_MSG_ERROR([json-glib 0.12+ not found])
-+    ])
-+])
- AM_CONDITIONAL([HAVE_JSON_GLIB], [test x"$have_json_glib" = "xyes"])
-  
--PKG_CHECK_MODULES([libxml], [libxml-2.0 >= 2.7.8],
--  [have_libxml=yes
--   AC_DEFINE([HAVE_LIBXML], [1], [Define to libxml package])
--  ],
--  [have_libxml=no
--   AC_MSG_NOTICE([libxml 2.7.8+ not found, building without xml output])
--  ])
-+AC_ARG_ENABLE([xml],
-+  AS_HELP_STRING([--disable-xml], [Disable support for XML output]))
-+AS_IF([test "x$enable_xml" != "xno"], [
-+  PKG_CHECK_MODULES([libxml], [libxml-2.0 >= 2.7.8],
-+    [have_libxml=yes
-+     AC_DEFINE([HAVE_LIBXML], [1], [Define to libxml package])
-+    ],
-+    [have_libxml=no
-+     AC_MSG_ERROR([libxml 2.7.8+ not found])
-+    ])
-+])
- AM_CONDITIONAL([HAVE_LIBXML], [test x"$have_libxml" = "xyes"])
- 
- # Checks for header files.
diff --git a/media-libs/quvi/files/quvi-0.9.5-autoconf-2.70.patch b/media-libs/quvi/files/quvi-0.9.5-autoconf-2.70.patch
deleted file mode 100644
index 55d9854a7acb..000000000000
--- a/media-libs/quvi/files/quvi-0.9.5-autoconf-2.70.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/777768
-
---- quvi-0.9.5/configure.ac
-+++ quvi-0.9.5/configure.ac
-@@ -6,7 +6,7 @@
- AC_INIT([quvi], m4_esyscmd([./gen-ver.sh -c | tr -d '\n']),
-         [http://quvi.sf.net/bugs/],[],[http://quvi.sf.net/])
- 
--AC_DEFINE_UNQUOTED([BUILD_OPTS], "$@",
-+AC_DEFINE_UNQUOTED([BUILD_OPTS], "$*",
-   [Define to configure invocation command line options])
- 
- AC_CONFIG_SRCDIR([src/main.c])
diff --git a/media-libs/quvi/metadata.xml b/media-libs/quvi/metadata.xml
deleted file mode 100644
index 428dadc0309f..000000000000
--- a/media-libs/quvi/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-	<use>
-		<flag name="json">Enable support for JSON output</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">quvi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/quvi/quvi-0.9.5.ebuild b/media-libs/quvi/quvi-0.9.5.ebuild
deleted file mode 100644
index 1c6ddec915e6..000000000000
--- a/media-libs/quvi/quvi-0.9.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A command line tool for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="json nls xml"
-
-RDEPEND="
-	dev-libs/glib:2
-	net-misc/curl:=
-	media-libs/libquvi:=
-	json? ( dev-libs/json-glib:= )
-	nls? ( virtual/libintl )
-	xml? ( dev-libs/libxml2:2= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-automagic.patch
-	"${FILESDIR}"/${PN}-0.9.5-autoconf-2.70.patch #777768
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-manual
-		$(use_enable json)
-		$(use_enable xml)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-libs/rnnoise/Manifest b/media-libs/rnnoise/Manifest
index 015161148838..71e1be44504c 100644
--- a/media-libs/rnnoise/Manifest
+++ b/media-libs/rnnoise/Manifest
@@ -1,3 +1,3 @@
 DIST rnnoise-0.4.1_p20210122.tar.gz 173787 BLAKE2B 33ecee81eb54a00e89c6fc0a2c9a3c66250c853cbef420f6b1fc9f7141b3b9862fe34fb31951de407c8912e940ac7e9917f68cb649261117d729b7b380d3476c SHA512 7d16f7d68a0a28ecdaaea098df5482d55adf7948292cab8ed78ae5cc6652ebdfc48e623f193ee356fcf527e54883e9d3938195f2fd52c20dff895fd2515617f3
-EBUILD rnnoise-0.4.1_p20210122.ebuild 955 BLAKE2B 97be8566bbd5c4c1c9719466cced40c58515cd00fd308da294bf87e9b956bcf44ad29e40bdaa9823a8ed78dfcd4d980b9195e219d65b5ebd3d02de57572ffc4c SHA512 8b9888cbadeadba88a43185c1952131ccae4f0e4c5a7eed9fe92e98cc8e2e8b7ef52725b7dc5125f29a8e497f36833172fa1d58c8ae71dc53505b3837d035bfa
+EBUILD rnnoise-0.4.1_p20210122.ebuild 960 BLAKE2B cca9ba3b79ace3720271e1f5bf90680c08f55e26dc0570339d69af4162cd84e143bc96de027edd0d1c4637943910b94ae1b9a33bf6dae4fcf48a446eac5810c6 SHA512 37aec2cf5f0b61cdbbd2b05fd76b516cfc3f66b48256bc532668441aad0d0f74e241b38eccb69462686f1e0291fd745321a8388c2fa5266680107fe4715a4dbc
 MISC metadata.xml 410 BLAKE2B 4bb73f9210c791887bf87b9d6476c339ed077d8a9e2cca19a7c96fdd6634dd7217cd96e196dd52f112f79ae88b320651fa91ed7f3b13a7db1a5ae6fb4fa2f1ad SHA512 ee72d3f004691ec17c5c5b95e5c602757a4679d7eb92d31afb1394adf34b758829ea2d1fb049d25a7db24247331e58c22ccb322421fe956ec843c65f7ddc612e
diff --git a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
index b9ca437a3818..158923f80f70 100644
--- a/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
+++ b/media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc"
 # NOTE: Documentation currently empty (version 0.4.1_p20210122)
 
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 7c4c6b0f451e..110b800d6354 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -2,5 +2,5 @@ AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab0
 DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
 DIST rubberband-2.0.0.tar.bz2 175527 BLAKE2B 5b4b8c98ade57f8b7776902166e8aa33e8f89d4de3fe659425a7ef14c1cf3c8a48ad474d2fe0f13483844b4f931ca8128ca57bb7e6dbf6e9d96deadac8856ee0 SHA512 a915a3eea75f0345e83010cc3ffd3c5e0c68a0c1d88da11b11a5fd5010196167c81db611a38c2c2b8d5c5a1f828f2c74a134e6ca8bb3a543af3ef70ce8d56101
 EBUILD rubberband-1.9.2.ebuild 1327 BLAKE2B 664b970e19dfcd36c601c6f42fe0f8fdb9ac35cd6666c52e60cca2f9c45889297f502edf5aa2c1bbcd347a9c88ee96ac42f3e9c7bf59e28291759cb22baf124c SHA512 78686227e171bdea6b3056dc6d96739c5010dc62d06dfbbbdce11a46f9b3bbba503e0cc7d9ecbf64d32586209d8683c8e882d3ad3ad9aa4997e5b8df4d6e29d1
-EBUILD rubberband-2.0.0.ebuild 1411 BLAKE2B 00aa35fe8fb784128e95e9ec878d7d81bb3d17f7261e7150c1e11b51104444910515fc007f27e042325f4dfeb8b7706569e6920790cb1930f44aa653b2400f8a SHA512 c18eee0aedaf43d85253228622334b002e7fdcfd34ccbdd2694138e44af478b812290da17b158c152a2ecb2d17ffe9ff16fecaaf1d3a719f62f761de36d7ba63
+EBUILD rubberband-2.0.0.ebuild 1543 BLAKE2B 03eedcdc50b08bb3a16c57afd30ab53a5242e058d7c5c673dff773b4c3ababa4a1ac3a10e345c74188ebbff36971d18949d8c2efcb1564215f652f87013fb8f9 SHA512 126bc35ee1920bdaeaf0e8bc2ae2fe36fd54cde303ade9d24e858b46a07cfd2f71a8bfc4eaf95fa5d01b1f4224b53a01cf3817afc3f8463196fd11cd88a0ac11
 MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a
diff --git a/media-libs/rubberband/rubberband-2.0.0.ebuild b/media-libs/rubberband/rubberband-2.0.0.ebuild
index 93fc5e3e5a79..47258d95fe93 100644
--- a/media-libs/rubberband/rubberband-2.0.0.ebuild
+++ b/media-libs/rubberband/rubberband-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="ladspa jni static-libs +programs vamp"
 
 BDEPEND="
@@ -35,7 +35,9 @@ PATCHES=(
 multilib_src_configure() {
 	if use ppc ; then
 		# bug #827203
-		append-libs -latomic
+		# meson doesn't respect/use LIBS but mangles LDFLAGS with libs
+		# correctly. Use this until we get a Meson test for libatomic.
+		append-ldflags -latomic
 	fi
 
 	local emesonargs=(
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2efa8844c762..88c670873cb2 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index cab419dc4d3d..0abba71d6aba 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -2,6 +2,8 @@ AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
 DIST alsa-plugins-1.2.5.tar.bz2 406134 BLAKE2B a1bb2f187c92a2999722e22775baf2c1fc4240162bb71f454c60359ef61b46934ff8ecd5af97589bafe2c7f737530cf5a4dcc139af7ed001d8dfe24bf3ae045c SHA512 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf
+DIST alsa-plugins-1.2.6.tar.bz2 408596 BLAKE2B bead0b9514725560a4fb738c4b1e14b148bf888cc82e0d7611cb6c494ed97a7e366b57f233095372c26a7bd614655bd58a6505202910de421561b540c94d5cca SHA512 ac54a6f227f1ca5f6e01e08d869e7c06f4bcd68f148932e1902a6fcf3e5ccd3667ac4d8c1a00b77e4b5cb27e17c01cf7526ded4aaf35c4b26fc69e14e6e341f9
 EBUILD alsa-plugins-1.2.2.ebuild 3043 BLAKE2B 765efc4efd1a9066af87a18fda76c6b3699069bd369e65b255988b9a5bcbfd59a8e805bcfc17ac1e0c35422f25185009511822f19792e8893882286dc5d07801 SHA512 c71161cb35b059916c5493bf3830d3e072f9e0840fdd5df41b2e6c71f70b4cb7ce2df37550c7a612c7fb0eeaf84c86b1061f69b9791cbd8424427df42cf0dd92
 EBUILD alsa-plugins-1.2.5.ebuild 3050 BLAKE2B 5500ac442070171a1fdb75dd95578bcc264005c2667a82ea8de9956cdde60b1e90bf38890b3d92bf40530dcfa109f7ab439bbde701148dd44629fd4fd5d597a2 SHA512 35c9f1732e65c4059e246d4e150a11ba3afcf50592438c8cd221d548856039138363dea7fc2ae0db3506fa9e2ef3a78accc9b6d644cb86f973a93c1a45627a8d
+EBUILD alsa-plugins-1.2.6.ebuild 3050 BLAKE2B c2bd1c77fc3ce4ad343076c78fda99f23347a0cd307b483c0f3b2b5a81f1e41b68ff770d681cbb84917b31549191eda2430f8808d602516d91051ced03755645 SHA512 ae87a3872ba2d0ba3bf7d54fcabb96fabd15c4242da78360ccd4df2bbd065f42a446b1f0d9e1c0bd4054f71a8a5aae9c053d347c45e51bcd15a600fc8c3d661c
 MISC metadata.xml 513 BLAKE2B e1725c32fd402ffd327c40965ea3f632237a6533bba78d4be59d729de1e46c24727aa7037aa185bac5da5c3066c03caf47d8047271ea93b4f62b15ac70cc6e81 SHA512 675a6013aec3ea092710b9bea4576495f23445ddb47eb8a230064093457dcccc75bef932036cf0174aad3909890243278bd89af53cf1c6c14ba8a1784070afef
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
new file mode 100644
index 000000000000..5aada389cb21
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
+
+RDEPEND="
+	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		-i pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		# default does not contain $prefix: bug #673464
+		--with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d
+
+		--with-speex="$(usex speex lib no)"
+		$(use_enable arcam_av arcamav)
+		$(use_enable ffmpeg libav)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable mix)
+		$(use_enable oss)
+		$(use_enable pulseaudio)
+		$(use_enable speex speexdsp)
+		$(use_enable usb_stream usbstream)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed \
+			-e "s:/usr/lib/alsa-lib/::" \
+			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
+			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
+	fi
+
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest
index dbbd884f0efe..3576a777302a 100644
--- a/media-plugins/vdr-osdteletext/Manifest
+++ b/media-plugins/vdr-osdteletext/Manifest
@@ -12,5 +12,5 @@ EBUILD vdr-osdteletext-0.9.7.ebuild 1206 BLAKE2B 26d9c561a70002d6531181fc039203d
 EBUILD vdr-osdteletext-0.9.8.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
 EBUILD vdr-osdteletext-1.1.1.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
 EBUILD vdr-osdteletext-2.1.1.ebuild 1232 BLAKE2B dc12f1752e8e66001fe7c5a2d7605b37983f121f5fd50218a268ee807c3b0ced95b2c0e63112a56bc6d191dbe1940d6ad806b1da45607f845317a482684c210f SHA512 9de8ac1f54cb0cce110094e658b8a21bb8d5ef6e76d5930059659743da942afc75b0e0538e0c2f954927ca140db8f36a07e0d8e092b3c8d7294149b7b6ce3401
-EBUILD vdr-osdteletext-2.2.1.ebuild 1217 BLAKE2B 020ffc3d38cdc47eb7a29b55ab7d41d00b7adf31df3f8c7b28ae5e00d6577eab5fe3cf47386f28e0e03ab8c914a2e87c2a30d942065356be1f347e8bf08ffbcd SHA512 2b66f495eb52336c9526c2e5b997bbe9d4c5302a22589439722809735395e768fb0be7ed90346fcb92abee3a8707ef1eddbde0058d0dd87780a8f6a8a48676cf
+EBUILD vdr-osdteletext-2.2.1.ebuild 1216 BLAKE2B fda6c6a0e1cf74042ba2cb2fe2c904e4b00d064409476826124d3ee6834fd077333594a968999f6ed9601d7860a921cd90d6a9282c3ddaf65ab6b1714fb62f56 SHA512 ed5e2c7890c99108c9dc485c163d1fcfa79801f365c9372e4460f8dc2da64ecbe3ce7ec9dd66576b0a6b085097ff9eeba457acdab9d9075e8634f03488f3ad6d
 MISC metadata.xml 508 BLAKE2B 0e1fd077065c9e960657a6a6b2648f77a96cf106c57732b31c65050d3e85cdb35f3f735944bfc423f79be8382f5f210dcc7acfe04cdc10b294400f579cda251d SHA512 9409dce6ee81e8d7a7541528880eca2b38ba500cfc38a8c2d0eb0636c54ab5b5cb2987befa9f420fbb28b391b0516299ccc02b25b60137bef024cf2e70ee15a3
diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
index c3c5b5559223..6c527f2d9682 100644
--- a/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
+++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/vdr-plugin-osdteletext-${PV}"
 
 LICENSE="GPL-2+ public-domain" #teletext2.ttf, not copyrightable
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="media-video/vdr"
 RDEPEND="${DEPEND}"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f175131c32b5..133581544693 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 0aa4ffcece90..283c2838ef26 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,7 @@
 DIST abcMIDI-2021.10.15.zip 607327 BLAKE2B f36d212c582c4098faffde797c55fcbfde086dd64cfbeca9f58300d80eeb519f3f5aaebf6649bab25912115c583a0e11998dd9c5076547bd77009749051ae7f2 SHA512 f9877444c28add8d036223d1f8aa309928d14a26b923509411fb5781192c77292138a02837015673a92c724b0ce59aa8fc11c66177371c9dd1d23501410f01e7
 DIST abcMIDI-2021.11.25.zip 607419 BLAKE2B bac5f8f31497a5cbc2133e70c7cfc1a925e22f8ffad67393a59fb1b976cab057f255bee9eaf4d8b48c597763c70e403aa9daf99a4ca82947d138493caed6d390 SHA512 d019c1445f75d91a7b2be5636aacadaeee29dcfbc195e2851ecf5dcf5ff0c45b459338dc625aed9cdcfcfaef1f1e120594126ded3ae044c3e3bae45ee6df38ab
+DIST abcMIDI-2021.12.05.zip 607621 BLAKE2B 8c34196df9921ef4c230d164f24100698ed0c84506a58b87cd783b1c91a3b40b5e7783bffcc37e09f7427aee9dcaf3fd7c539928419f8b798b75ffe495f9e8d8 SHA512 3cd5f14a83df5fd02be82c7355751bfa148efac09e3b0c381d9ec298bc727233ef44739cd239562b0b06094c70841fc0650234296a8d0667e71e87d5774f7df2
 EBUILD abcmidi-2021.10.15.ebuild 676 BLAKE2B da71fd66f245bdac7a72f8016e7c1c9324561e6f4b1cc0f1e943672edd93ae174913af401a8b0aa07a48926a9f508676d8008402f357a914a9e41252ca8e2589 SHA512 4505cce6306e087e8a8c038105ff4f3a40933de133a75159d735f7b08f41a3801bab2b03d32e52c29ba699814f96c654909bbb0d7088f952503963fcb3608b4f
 EBUILD abcmidi-2021.11.25.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
+EBUILD abcmidi-2021.12.05.ebuild 678 BLAKE2B b09a3d0f7474ccaebf61cb08b70511e4a6a968af676434d24a90773632503424befdfac284b762eb02168f5949fd79c2349ba36fcf3f1f10c721018b0750f689 SHA512 280fe2968d73a5db39665edcc822938f8ed2ea7f47108dba58a42cc3ae4a053a0b7db4ca67db090d5a77e5a9aee14700a23b73c9494b1dcbba2e9f07a04580ba
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2021.12.05.ebuild b/media-sound/abcmidi/abcmidi-2021.12.05.ebuild
new file mode 100644
index 000000000000..a0a2a9de38ec
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2021.12.05.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index bbdc11ed4651..deee51ce1656 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,6 +4,8 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
 DIST alsa-utils-1.2.4.tar.bz2 1286259 BLAKE2B 41eb0b8186c1956c19d8f8b28863ab54c66ff531b9ec5c48cc6c5ed8ca249d135614112ce412d6adb6f21982235e06a4148591777cce00d17ea537aacbd664ad SHA512 13080abda55269513b3751044dac292d695e273073a62d74ed4a32c68f448a2b015fe16604650821a6398b6ef6a7b6008cb9f0b7fb7f4ee1fa2b4eb2dcf29770
 DIST alsa-utils-1.2.5.1.tar.bz2 1326965 BLAKE2B 79f96fd3ba1d92e72dc634dc01439acd3ccd02555c39cc1714c52bbd1e4bc8b68ec7bf5d219a704533e4a61587c3528504ef9cd7c652924d74daafa90f74e42a SHA512 bbafeb9189ec5802965c4e69cf6e7cd4c132ffb77b57f164d6585649890f96edd052c72697171fd629b39e12f78648fea634468df34c1a80255227ca397907bf
+DIST alsa-utils-1.2.6.tar.bz2 1334063 BLAKE2B 3b81cccc836e0de9f6d98f311dc3a316a02179ec1fc7520da9658192f27e7701c6dc41b04a82639d6269d6943afd8a89cb6477406cbc36ac450e57919cff46f2 SHA512 6842f0f4c2f7cc5ac3ba94736ee259d9988b5d3e0d2b522f858d712e16938d2845fa9ef64f4aa60222b8ef6738e053f9113a5ea24a197f2c0d6c4dbd70030f5e
 EBUILD alsa-utils-1.2.4.ebuild 2347 BLAKE2B e88315e90b294ccdb23be786b62441b4dc8a962512253a585b52eb20c0198e6c5b19105f2f379829002afa5f04c1ffd6a4646a4c413585bf07eccb7bc7b13343 SHA512 aa4a8d1783e8ccc6ac18a1143fcb8200a24132cbe12d547ff22c77634fd05b212dfec2aeb6d72bf8f2a2526707e7898d9daba01f5673245b3d6bae59b733a19c
 EBUILD alsa-utils-1.2.5.1.ebuild 2362 BLAKE2B 7acbdbc09430867420509a8d1eec1bfe99384e7c063d5409844ff320a784a7a1621799c78f5c0368f41eb0b17438d6389f4fbe6d581955f4dff6e45920f467f7 SHA512 5089297682395c41c7aec121853425d0c5acf9232e4cbd6b83a0b4bedc6ca3e6e3ebd4b5a8926fd0d22e1a4d5b3f5d2fb858b5a30aab3ca144416e1c17cfafa8
+EBUILD alsa-utils-1.2.6.ebuild 2362 BLAKE2B 62da683d992eb5eda22a69860397dd0f730f108854d5174318e282595c16915d8cca24a906a1d4537bd47ff9baa7b097b8c0f3f5bf306404f50f2c0ea46c39b5 SHA512 2a732932b831581f985167b3f1460c296221252652cd54f32d91130d24dbbfa928dbb0d28f678a9d16c6273d1e68cc9f550b758f2c2cb9690a318253e9338c82
 MISC metadata.xml 480 BLAKE2B 1017b3f508632b0a56786a3b1e46304e4f4cbfd78335f07894ea0d4200e743a22ff0f4803f38314d0fc10dab6d35c40dd1af69e1d5aad3d36034a1cd504c4862 SHA512 c8440f0dc84c3e0d5459c07b975fc723ab346c5b817aaa1ae113964af9678d89d00692fb58494a1c88324a5cfbc9d2bede644362b34e97405c6add51730e943e
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
new file mode 100644
index 000000000000..78f480047b42
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 893ed2cfc865..d07f6a25f786 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -4,5 +4,5 @@ DIST easyeffects-6.1.4.tar.gz 1959269 BLAKE2B b3a4b7f2e1816353bfda4d232f380483e3
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6
 EBUILD easyeffects-5.0.4-r1.ebuild 2272 BLAKE2B 9a0d0a24d713e2effca773730c0b7e7afaf83e4561b5bc83ca1459cada358e039e7b8fe7ded4c6dd6ec8f30ca8ea12d33fc65822b5ae2d812f320e71c2634a10 SHA512 b51edb7406290d1389ab8f98efa47c0739564ea8aee982acc27a4f544b5fd35211220b7361b7697b2d4f1b63e1d6e645016a4050c2ea482673e986dd314a31d0
 EBUILD easyeffects-6.1.4.ebuild 1997 BLAKE2B ac38c18dd06f16486a7d4595025b64e607fd28f75bae3de7ff12da36f421b2f003c0b79d15e5faf952e01260540229d3cf3ee3c63f3c363ae54f42911861ade9 SHA512 e58bcb7303515868a68e8553a2c8c0028cd8266514ac662d66786af1e4c34e89d02be8e7637e17d1e0b8bd70d23707931b9ef51eebbaf96df6b3eda351e0c66e
-EBUILD easyeffects-6.1.5.ebuild 2010 BLAKE2B 6a995c3015311d0bdd97d9139d7cc695a7af9ceb9381306744a1a102b17e3d6ab5e50e51278c32976f8c7b55fa77d0750d2a2ed1fba253c4442ebe33f1921eec SHA512 29c0f45ab2ca8c120d8f31d183585766e5005ffc93cf4efa38e85761bf3832bcc1cd07bf8341ef6adc90d7267052d609e68ec6527502f66da391925b6963cfb7
+EBUILD easyeffects-6.1.5.ebuild 2015 BLAKE2B 57921182fb3a2b9f1751c24b75614b8fe9ad42be4754463c19ccbf3de39b186564bfd3f13dd2ce9bdc9a4167f9945e44d297d8c930ba4ec4603ef48b20be1c93 SHA512 4f76014d7358280c49c186847ae7a306267afb3b976fe67605bcefda6c0908a793b0dc4fe14a409e7ba870eeaec1b0a461f539ab7504ec44ed3446ba431a38d4
 MISC metadata.xml 1285 BLAKE2B 2f08a86e1d8dc764ab015461101f7983cbad6c4856239ba2dcf332e23f3cbdeecb9e93bd464315b86125b708e8dba80008f1536dc4cc8fe240137e3cfdf461e5 SHA512 6bd4a58517ba2124ec04cb7dcbc36fc8f029729041abe623e1e4de8671439bba2471bb6d03febd780b820a2bd9b37384dc3c289c87f6eaa39d2005b544f16cf6
diff --git a/media-sound/easyeffects/easyeffects-6.1.5.ebuild b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
index 600dcea72c95..e2384d6fb9ab 100644
--- a/media-sound/easyeffects/easyeffects-6.1.5.ebuild
+++ b/media-sound/easyeffects/easyeffects-6.1.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
 else
 	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index a7b8db19235e..b0ece183dbdf 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -2,7 +2,9 @@ AUX hydrogen-1.0.0-gnuinstalldirs.patch 1879 BLAKE2B fe0e76210853f05a1f6df2b6208
 AUX hydrogen-1.1.0-gnuinstalldirs.patch 1879 BLAKE2B bf1563cbedc0b3a6d2aefcfe6bbf1bfd7f44ea26456d18889d684763f9af8170aeacc5887182ea845093c5187e92da51298dcb44bd99d6c2f0c5a47adbe5ba7d SHA512 20cc8970301192c967866f27b344591a58747a3a501eaa1b5d92dfb82af48e98f5c9e4c7908084f2845d258f323cec0ec42b578797b1bc3447c9b1918cbbdaea
 DIST hydrogen-1.0.2.tar.gz 11533410 BLAKE2B a4210e666b11e173eb0e02728f601ac9811941b558096ae76f3ad45b91c5db1ff942cddd536a50f8f2f456871d69f3a6c52d53c926f4547f13783ccbb4fc250d SHA512 7466b7ef1da4a078d67e1cab8744b2e0c3c048bb55e1febd22023c591ed9e2bf1cea41adc38a775a2ac60978735517a92df404d5ca8bb13603ea68c8da70daa9
 DIST hydrogen-1.1.0.tar.gz 11413446 BLAKE2B 8008336d2199bf36d9efca8875217e4a5f3d66c0274e25334525292e7864ca1dc4da75f86cbba981dfdbc19a3dbafebff503ce1ef597adae56fc467b44611a19 SHA512 116380be03f03a9294e278be5c7ede90fe088f21bf31db46a5e5df2684d11676e518200e6c4a187063c769f5b97950af9602b9b2694ca37788f73a2666265cc8
+DIST hydrogen-1.1.1.tar.gz 11417837 BLAKE2B 52f6f61fc6e247875688dcea2290d92eb7bc85910620f0adcb52506d587b02dcaec6e2ecb72c77cf4eb3134534c75fc64bc4dd76a63f886cc6ea07d9b8812089 SHA512 c5e6bd713a0f9ef3b30bf0ae00bc41fea7494c20342c14c9f41ec05d1fdd3be721ffc3ff92bacd011e3b39a68022ea04daf55e60d334f64a00abef17d892cd37
 EBUILD hydrogen-1.0.2.ebuild 2079 BLAKE2B 6edfa53c9d4609d76dd0923dbe9f726f25ba14d7eae18c1b1a1735a3b7bc630912a4a0ab45d6e961ff0b43a09ed35ed2adca11486df531db93a771bc4d2fa06e SHA512 2337df146265eeba5c1f5216e14d6d487a97493f316e95a671c54765279768b70acd46da7ad4bccff8076b97f999f458de72c7014bc21c6c9ec893b1ca0693c0
-EBUILD hydrogen-1.1.0.ebuild 2039 BLAKE2B a76037393333d532b1c8d2fc273f9d2c88492e479b251069da4ae7b510f2d842227d67192fdabc34c74efbccf30f9ab7fe73569dc02de89b7eac2e7cc37f09ae SHA512 0dd08ba3b7d3f45c85b23937f32d8fb9245a65dcdfea5f23ef090052a9b85bfd943d549b2c28b9a770362a151f4fb4fff6d8da54fbcffd42584f0d0767dd6d13
-EBUILD hydrogen-9999.ebuild 2050 BLAKE2B 6196b99a92cf45e3b4af44f5015e19c1727af83062362332459dd0b207baea81822e7ceab88942b37a76bd8f8ecedc5291cb666a2c753a9bee430b7d3f43f792 SHA512 c0c2426def5cdbdef507d724f6c22d79da050064d96ec70add7b1b9554c6325eedfaa0817f6dc49d44308d964693546921bcfcf0df6231da8b9dc85978f3d118
+EBUILD hydrogen-1.1.0.ebuild 2079 BLAKE2B 32f5db272650f71d573264c5466cf963c01d25108a6a930378480106d30c53c99b7367992564720c3a02dbcf147f594807904e3af6460605acdc773dab7f5f84 SHA512 00f0756680c74df3ddad342b08832ab1aef12fa87b2fb8b2ba3b90a56371746d73632be70445f086910362e9210c7384084e9a71eec7f056ab08eb874b05ab22
+EBUILD hydrogen-1.1.1.ebuild 2090 BLAKE2B abc474aaa19680527906c49da5cd94346f61cf8bdd2c1781895f736ed71219ecdda00d3e4018e0c4ef189469acad50bcf0cc8ad92253608981610456eac0b190 SHA512 3dc8adc1822899719230ae5f7b999c00efa7e5756b3f7e80400a3bad6db09b006814745bea9200e1f2cac4000aaf3ccde913cdaccbce67d2270fd20487779513
+EBUILD hydrogen-9999.ebuild 2090 BLAKE2B 194dad4a7e4ed8efe043e4d53175dbe42805153670eadfe4e2fb51ae3c7ec80531798cd96904e89a859105b2084114c88991b0cef0bef32affa8e5fbb5b47d53 SHA512 00d1a1367617ead9ce2c2853efc58c081c37ec9aada417b47beab567ef143c5ae6561aa8c3fc0bfc2b677bb2346c3ea3f693adfff41851e106591e8add5a2a95
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
diff --git a/media-sound/hydrogen/hydrogen-1.1.0.ebuild b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
index 966393b75e6b..99394f5d5f81 100644
--- a/media-sound/hydrogen/hydrogen-1.1.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.1.0.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
 	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	doc? ( dev-texlive/texlive-fontutils )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/liblrdf )
 	lash? ( media-sound/lash )
diff --git a/media-sound/hydrogen/hydrogen-1.1.1.ebuild b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
new file mode 100644
index 000000000000..da67dbaab4b4
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-1.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+else
+	MY_PV=${PV/_/-}
+	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+fi
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+CDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	doc? ( dev-texlive/texlive-fontutils )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="
+	${CDEPEND}
+	dev-qt/qttest:5
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-gnuinstalldirs.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
+}
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 6d861d99ffa9..150f2e7c64d1 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -40,6 +40,7 @@ CDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
 	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	doc? ( dev-texlive/texlive-fontutils )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/liblrdf )
 	lash? ( media-sound/lash )
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 88ddd574f509..4a14d5de9290 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
-EBUILD pavucontrol-5.0-r1.ebuild 833 BLAKE2B f90664f078155feede1197fc5b096eb61dc23af0b34795875e5a621787cacc21feda80e328008750f70205c263c5eeed49acadf658ed6a39d48d08bbb3622b74 SHA512 aa80a32798079aa0fc77fb9e0959465967e287503d287df270abe264d36da6d1d079eedd6a270c41b314f709843691c414de906140db62540c08093ae689ecec
+EBUILD pavucontrol-5.0-r1.ebuild 832 BLAKE2B 1a30b574beadff9fac98c365ad33f369d48a196a3ae09863c0c442a4c58e00240bfbfe17572ceb550d6d964fb3ba22ad3abe71c6b88e089181fd6d61cf40c7cc SHA512 e6bce7c6a3f51220dc418c6380317634e8e8d0b8b9f82e276d330eec988f1fca719acc45971b7a94434acfaebbc6022d9f16fc9497ce490c598c80031c9c3cd5
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
index 6274d4258cf8..d1aa59fa73e0 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index b8c1df832d82..2212f6fe9e7e 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,5 +1,5 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 543 BLAKE2B db45bba7c2f5e7d3325340568a1163627dc909192bc7721436b34216cdc2672c1134f817367a8783810412e909c6934a45f730f7623787b6819a88cfacd5aa0d SHA512 e5e55ca07bf38627d45a7761027fb49dfb4736b59ad0ad5441bcf1c51fef3678ddb4a6974d6febd2e74fed90a6535d0f4dcd80b4b587b2087c3ec3d1ed18ae3e
 DIST qsampler-0.9.4.tar.gz 284055 BLAKE2B 83f0eb7102d6dbba994d2efeee59ebc46ce2b07d40b9dcfe97ed3059fefd449fa90167718ef65ef41f04709ef9c985c86e2b35a0572b47a948172cf5b1a5dc23 SHA512 0e43a335c503bd76d41bfe88967b199bcd8c34a44a65293c1460daa342ca1e35f236984af74e30404637e9f6c8428b4cc52fc27501af7d52e1c9e30f1a80d35e
-EBUILD qsampler-0.9.4.ebuild 1149 BLAKE2B 24adc485f6dcbad6d34712d9021b622a3db66d0094558a83fc6dee56eeb083ab10159569d61d641883e8574c691417e69cc518da9560b982ea4237da1144fd21 SHA512 d98e52041849c6372faa209d2983d63c307346637c021901111286bed5eb73fb4ace7132e76e7bb817f31d22b41a927a47b9f92deb49a0263f33c0a55f309282
-EBUILD qsampler-9999.ebuild 1091 BLAKE2B 0e70c9b8c857bcffd4619e31f8610a4a6d7728ea06319cbf0d25fdf9e6ed7b6b9707f2fe61d73a3d04ea24ea567695137da8f62c0c908c6e1378c336bcb7523e SHA512 0afda6467ac557df22f6988d7150d6eca07e51f98848f7188b1fbcb78bb87c2e02bfad01f1e96a4961904f66ad1f950c20d8529c8882da7cdc9622325ac28220
+EBUILD qsampler-0.9.4.ebuild 1137 BLAKE2B 840ed40ce55f34e831abc36184174e7efbfb9cbd811042df77fd2ae7e8691d73f0a05b47ff1fb121634d2e389e05fc888cbd8eb1fc2d4ae534e4e923e31d02fe SHA512 ffe1374211b4aabda05bd4d4fb8b829806759f7ea3873bc8714e71fee7e82d8cf0df200860a50a23e38ca98e702e8474b7c7118b86a07db3a75b085391561614
+EBUILD qsampler-9999.ebuild 1066 BLAKE2B fb8717ad1c4fa88cc5a0177a6fff158cfca12c0b5ef717d808ae70b721f733534895dc80ac9f3ae1a0862d44e3e1354535e72fceff18ba62d5d66794177659a2 SHA512 fb773e6378edccd26ad0e6be0deb16481b604432e505ac2581c4cdb5c431aaf70b9055abf5dcb6e5dd84d5e8b9d23467113e8bc7ba118aba40ffe873af3ae57e
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.4.ebuild b/media-sound/qsampler/qsampler-0.9.4.ebuild
index b1939a889744..6e2be545d90a 100644
--- a/media-sound/qsampler/qsampler-0.9.4.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake qmake-utils xdg
+inherit cmake xdg
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 3fa9e7942e40..8b26d4432493 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake qmake-utils xdg
+inherit cmake xdg
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="dev-qt/linguist-tools:5"
 
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+DOCS=( ChangeLog README TRANSLATORS )
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ca3a9b244fef..f64057526e5d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
deleted file mode 100644
index a321c907ae22..000000000000
--- a/media-video/clive/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST clive-2.3.0.1.tar.gz 43551 BLAKE2B eea428fdce2598e01e85a81f90110f2f1e4a7d9e8033d39745817d97886f80ddadfe2ba649e9778ab84f11c2f6fe2360eefda24cf5d0285c1a1a248ee7f6b1b6 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc
-EBUILD clive-2.3.0.1.ebuild 1693 BLAKE2B 4e7901be83753258205d9a1da385bc4682378f40a05e2c530aeb96337964a272893d1c11f74ad8bfa85d0647d70ae18b5a6e274f472e3e9a7ec20f925f9cf72d SHA512 e4290fdced6b331e13a9c7c8f669ff380625f829421a756f63d64a23020e53e13f7f7c42615270b0344ebcd9843d2357dfb368321a231460ee7d17b0493e5180
-MISC metadata.xml 700 BLAKE2B 12fb466452d9bbd30c58da35bce88305ef30114c34f971385a29b18f07805a6b25ca95dd5827129dc8735e2ac54ad2275e42e5b1a45e1d54e500f4ba9267c46c SHA512 6e6d8b2d133ffbe4f21d70541887bc8572f53c887e951f0f716712370b5a5136783e219a09654b34ca2a73ae3b95e054682527c65cafe439f0037e42772112d6
diff --git a/media-video/clive/clive-2.3.0.1.ebuild b/media-video/clive/clive-2.3.0.1.ebuild
deleted file mode 100644
index 60f93ec9b36b..000000000000
--- a/media-video/clive/clive-2.3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL_SUBSLOT=no
-inherit perl-module
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="clipboard pager password test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	dev-perl/JSON-XS
-	dev-perl/URI
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )
-	media-libs/quvi
-	|| ( net-misc/wget net-misc/curl )"
-DEPEND="test? ( dev-perl/Test-Pod ${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_install() {
-	perl-module_src_install
-	dodir /etc/clive
-	cat <<-EOF > "${ED}"/etc/clive/config || die
-	--quvi "quvi %u"
-	--get-with "if type -P wget >/dev/null 2>&1; then wget -c -O %f %u; else curl -L -C - -o %f %u; fi"
-	--filename-format "%t.%s"
-	EOF
-}
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}
diff --git a/media-video/clive/metadata.xml b/media-video/clive/metadata.xml
deleted file mode 100644
index dd82ce744e92..000000000000
--- a/media-video/clive/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">Command line tool for extracting videos from Youtube, Google Video,
-		Dailymotion, Guba (free) and Stage6  websites</longdescription>
-	<use>
-		<flag name="clipboard">Support reading from X clipboard</flag>
-		<flag name="pager">Support pager!?</flag>
-		<flag name="password">Support password controlled sites</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">clive</remote-id>
-		<remote-id type="sourceforge">clive</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest
index 58c71a968ec2..6f58d62a86fa 100644
--- a/media-video/droidcam/Manifest
+++ b/media-video/droidcam/Manifest
@@ -1,5 +1,4 @@
 AUX droidcam-makefile-fixes.patch 1834 BLAKE2B de9b0ae494e419d89dee767afcc78fc8d5222dcd54706ec94a875c032e835015ef60b8a60285a99974df5dde35becd742432bb81e818574022fd699af021e9ad SHA512 5490ce729f622ae93319a299317c1d394cb7af1f1b71c71c1927ae259a6cce682b705eb26fc0c95c467716c9f79b81688ba2d12e33c1c8af4b454333d8cdbca8
-DIST droidcam-1.8.0.tar.gz 84376 BLAKE2B 581e57e2c80dd9662764e399dd797e5893f617e69ee2501a1063d1c51434baf64d7d2b72779debede6d679127f31fa95a4e67953978da591acbf6a41bd05551d SHA512 b448f686562030b352630c6b677a098ecb5041582dd06e57809b04674cb334d02ddfdf1d09b43e1ecc70897e8073714ad6913ab14d894a7679fc433adb3fda82
-EBUILD droidcam-1.8.0-r1.ebuild 3474 BLAKE2B 9cfbca9e3254ddece5369b932294497c1f27bb8e73904d663eb7e727a82cce1a132221a59cd0de8afb8d12ed1cadcd19c4bd19328c9ef104f7d72c5f82579b43 SHA512 c849bb9cbbc84d987da9bf54a7972016142d562dceb8ae4ce81fd04b3a3c6d2da6073f38dabb240eb429244098d48ced1ecbd0254642e4c2573389f55a3d514c
-EBUILD droidcam-1.8.0.ebuild 3094 BLAKE2B 942b8790090c2edbd1a9f35bf7d34e451f51b903a96c62424433b982959c7fc3ecb55a01c5b069869953b416cc6aa421760ca680da7d36dfdaed2fb0f3b5ea98 SHA512 6dc37f34ca0f9f0c4c8e2d0ceb0c8e778726baddd59c3e9c58177f128e8088bb0c92113093ae05e617f54f9fde1f42163908301420aef730c0105902950cc221
+DIST droidcam-1.8.1.tar.gz 84566 BLAKE2B ba023c98159003bef39eac2fcff211243aa5fb2cc4369a333c5b78c9708b8c34ff9987d6b84628b32e436bab776e0c8c83f75b7c6a788f85831d3d17dd468833 SHA512 58ce6014004edcbf89b4847ed916f9cd2757865172c61e446a04b2f6d93395db1013f0cb31f0b10161bfd83a1436e684891c3457371a3ad62308509bb85b4cf4
+EBUILD droidcam-1.8.1.ebuild 3474 BLAKE2B 9cfbca9e3254ddece5369b932294497c1f27bb8e73904d663eb7e727a82cce1a132221a59cd0de8afb8d12ed1cadcd19c4bd19328c9ef104f7d72c5f82579b43 SHA512 c849bb9cbbc84d987da9bf54a7972016142d562dceb8ae4ce81fd04b3a3c6d2da6073f38dabb240eb429244098d48ced1ecbd0254642e4c2573389f55a3d514c
 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02
diff --git a/media-video/droidcam/droidcam-1.8.0.ebuild b/media-video/droidcam/droidcam-1.8.0.ebuild
deleted file mode 100644
index 60f47eb1847b..000000000000
--- a/media-video/droidcam/droidcam-1.8.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop linux-mod xdg
-
-DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app"
-HOMEPAGE="https://www.dev47apps.com/droidcam/linux/"
-SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk"
-
-# Requires connection to phone/tablet
-RESTRICT="test"
-
-DEPEND="
-	app-pda/libplist
-	app-pda/libusbmuxd
-	dev-libs/glib
-	dev-libs/libappindicator:3
-	dev-libs/libxml2
-	dev-util/android-tools
-	media-libs/alsa-lib
-	media-libs/libjpeg-turbo
-	>=media-libs/speex-1.2.0-r1
-	media-video/ffmpeg
-	gtk? (
-		dev-cpp/gtkmm:3.0
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-
-CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
-ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support"
-
-PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
-
-src_prepare() {
-	if ! use gtk; then
-		sed -i -e '/cflags gtk+/d' Makefile || die
-		default
-	else
-		# remove path and extension from Icon and Exec entry
-		sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \
-			-e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \
-			droidcam.desktop || die
-		sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die
-		xdg_src_prepare
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-	default
-}
-
-src_compile() {
-	if use gtk; then
-		emake droidcam
-	fi
-	emake droidcam-cli
-	KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
-}
-
-src_test() {
-	pushd "v4l2loopback" || die
-	default
-	./test || die
-	popd || die
-}
-
-src_install() {
-	if use gtk; then
-		dobin droidcam
-		newicon -s 32 icon.png droidcam.png
-		newicon -s 96 icon2.png droidcam.png
-		domenu droidcam.desktop
-	fi
-	dobin droidcam-cli
-
-	# The cli and gui do not auto load the module if unloaded (why not though?)
-	# so we just put it in modules-load.d to make sure it always works
-	insinto /etc/modules-load.d
-	if linux_config_exists; then
-		if linux_chkconfig_module SND_ALOOP; then
-			newins - "${PN}.conf" <<-EOF
-				v4l2loopback-dc
-				snd_aloop
-			EOF
-		else
-			newins - "${PN}.conf" <<-EOF
-				v4l2loopback-dc
-			EOF
-		fi
-	fi
-
-	einstalldocs
-	linux-mod_src_install
-}
-
-pkg_preinst() {
-	if use gtk; then
-		xdg_pkg_preinst
-	fi
-	linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if use gtk; then
-		xdg_pkg_postinst
-	else
-		elog
-		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
-		elog
-	fi
-
-	elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480."
-	elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf"
-	elog
-	elog "Links to the Android/iPhone/iPad apps can be found at"
-	elog "https://www.dev47apps.com/"
-}
-
-pkg_postrm() {
-	if use gtk; then
-		xdg_pkg_postrm
-	fi
-	linux-mod_pkg_postrm
-}
diff --git a/media-video/droidcam/droidcam-1.8.0-r1.ebuild b/media-video/droidcam/droidcam-1.8.1.ebuild
similarity index 100%
rename from media-video/droidcam/droidcam-1.8.0-r1.ebuild
rename to media-video/droidcam/droidcam-1.8.1.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 97075c1432ce..b469d931d6ef 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 35f4ee390dbd..61d39a8868cd 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Dec 2021 06:39:13 +0000
+Tue, 07 Dec 2021 14:39:11 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c59a505d6c73..8c8099bdbd7f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2021-12-06T06:39:17Z
+TIMESTAMP 2021-12-07T14:39:16Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGtsBVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGvchRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCVIQ/9H8h6GwElxE0lW8BLPacNScPUZOatGOKHzjHmR8hw/qMGpq3AeSFVbO0R
-iC9JEz0Icncft9zg+U5zbE/rF8K4ZMfehxzZoZSJhr6rw+gxTV7YnCj+LH5JxmYu
-Sfmj6jd2bZVMgtUqi8/QW/z9IZcAQ6H0R2mT4VCwtUSfgnC5RGcBm6/m8J9DkWQ4
-celQOy9WiwR/duQctkbLTrS53wm4AZDN0Lev/hPOT+HCmOWpfckfEOJfAm1xMllP
-LYo087p9V1EJlfzeE3p5LpupSYock48rijoRF1i29rJkGE2U/IulWoUgDKRoak9f
-tjKELnnUiwuBcqEHjPa1zZNGS4rQ6YA9h6FQYWJQFLiWnRRHPVzjgIYm7+HJi8oJ
-So+R7gCx1+q9D4aK4LniGfSjpro0Jujhb5N3alSxfxDDQvTweykUnv0rB/SlljMl
-o3WrscKjbbJAJNdeFgI5Ev8LdEPWoIIwcx9nVZ4N769MsaCpC9BvTpwMb7Ab9Hga
-cJFKacSCyO3fP8lmOn9qYdorDdBeQ7t3PueVHLRFDMyjsSNnLxDKgamiuRWIt54q
-fp1r7tPfWU90EWffKeeSpJq0uBy5s+BGkdnCMI/vBNhMc0Mux4wnqPIjZNhmk6VK
-pa9e8xHyGl3WkQv9QYmmQCxKHL+o2erVKfDOdCshlTUnSq+TajY=
-=hdKf
+klCw1Q/+KJIODjGwyRIuOOxW3Hn2xsxUMw6b+HrW8u6VnsZI/t4GjAPUttPwF+sE
+YdRiLx/p/47hcILTTCHskz6qdk2aQg04q1EQ+w/mY9xHf+Noh5nDHyd6pzcyZcFo
+nLu67HlCcRjtc9JdeMe5ObbMcWRncMtGxDpzFjkEFNuRuSCE2QK7bFde6TbqrAZP
+rU9dZlIK1ZpbfA/gwuS1TZzhiacbplyYtuLRjq/S3u+hIrqAwAjHeo+KcMQQSewT
+bL1Y+ZCMpkCdjBE0gMMipRhTwrJ/jg0Qui/HVfOsL1oCnbJV3Fbw3vqp6Ttcel6C
+2BBP7QZGp4dOPBIMIbTNdgdl8NbC4/1vSh45cVo5Q2exvLqEoqL3IwtEUntaz8Zk
+QGM8Zf1F0ir+RZpQblJQno1H35fuFvE7J4fA60tGIYBxZOI5ae6tbEe0NYDlJBRG
+3s5vCldtqAQYMmikqm3qVVnNlFOD9o5jwXDvXW/nqCmAl7V0w1rzPM3NxZGSpsMB
+T30R5EsC78mWJrDNjEqD1J5VfaNzfV+vjyqX/ARCyIIDaqevt+E+nBhXaNBRfd8Y
+p5Si1i1obnvEJPfhpyiTh6miX+qvJvNCRnOs98/Xkgfr8n6uF8RG12LH4kGHDNS0
+czMQ/8BeOE7yCQPMTEQ+ToMe9AJPixKKHoxfyheQk7z5/Is51Gg=
+=6jBE
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 35f4ee390dbd..61d39a8868cd 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Dec 2021 06:39:13 +0000
+Tue, 07 Dec 2021 14:39:11 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a057c18bef4d..45bef9e75f94 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 29e817066a24..f505104e98d0 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/ejabberd-0 b/metadata/md5-cache/acct-group/ejabberd-0
new file mode 100644
index 000000000000..b3804776644e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ejabberd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for net-im/ejabberd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	d12e466819e60dedccac935746c2b151	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=a74c1cc972d6fa63e975e87bb3bca3b1
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 800af7f365bb..868bd016166d 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/ejabberd-0 b/metadata/md5-cache/acct-user/ejabberd-0
new file mode 100644
index 000000000000..909e32173a92
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ejabberd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for net-im/ejabberd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/ejabberd
+SLOT=0
+_eclasses_=acct-user	b3a6f9d710c598ea09935e86d45fbc36	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
+_md5_=ba3926a8419e59beb530839adad8bf8a
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c40f8db6ff06..a64f7c2a90bc 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.21 b/metadata/md5-cache/app-admin/awscli-1.22.21
new file mode 100644
index 000000000000..78434c838e5c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.22.21
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/botocore-1.23.21[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-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=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.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.22.21.tar.gz -> awscli-1.22.21.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=78a874f096accd98a3c5589fca2d092b
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index aec4c6899860..09b93107a817 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/gzip-1.11 b/metadata/md5-cache/app-arch/gzip-1.11
index eb7d201e3dc2..a853f0411f6e 100644
--- a/metadata/md5-cache/app-arch/gzip-1.11
+++ b/metadata/md5-cache/app-arch/gzip-1.11
@@ -3,9 +3,9 @@ DESCRIPTION=Standard GNU compressor
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-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
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.11.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.11.tar.xz mirror://gentoo/gzip-1.11.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8412be695992fb269bf7567e140d55f9
+_md5_=07cea2c760b93227b3722a1664ead861
diff --git a/metadata/md5-cache/app-arch/rpm-4.17.0 b/metadata/md5-cache/app-arch/rpm-4.17.0
index d1e082be74cd..e345c90f8af8 100644
--- a/metadata/md5-cache/app-arch/rpm-4.17.0
+++ b/metadata/md5-cache/app-arch/rpm-4.17.0
@@ -5,7 +5,7 @@ DESCRIPTION=Red Hat Package Management Utils
 EAPI=7
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
 IUSE=acl caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) nls? ( virtual/libintl ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.17.x/rpm-4.17.0.tar.bz2 http://ftp.rpm.org/releases/rpm-4.17.x/rpm-4.17.0.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a32e4452e34d13a126211ba221791a6e
+_md5_=323174c022631650fb7d1c50918108f3
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 8535d516d158..1e15ae9c45c9 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/dar-2.7.2 b/metadata/md5-cache/app-backup/dar-2.7.2
index f2ec56998d9c..369fed2376de 100644
--- a/metadata/md5-cache/app-backup/dar-2.7.2
+++ b/metadata/md5-cache/app-backup/dar-2.7.2
@@ -5,7 +5,7 @@ DESCRIPTION=A full featured backup tool, aimed for disks
 EAPI=8
 HOMEPAGE=http://dar.linux.free.fr/
 IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync threads xattr
-KEYWORDS=amd64 ~ppc sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:1= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) threads? ( dev-libs/libthreadar ) xattr? ( sys-apps/attr )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/dar/dar-2.7.2.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=23569e815994ebc8e6186cae7d69b3ae
+_md5_=a11dbeb6e99d77b32ac4e6d01b2e007a
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.15-r2 b/metadata/md5-cache/app-backup/snapper-0.8.15-r2
deleted file mode 100644
index fa8cfa59ad79..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.8.15-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=7
-HOMEPAGE=http://snapper.io/
-IUSE=doc lvm pam test systemd xattr
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openSUSE/snapper/archive/v0.8.15.tar.gz -> snapper-0.8.15.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5886507cf233d3f58ec8f681796a03ca
diff --git a/metadata/md5-cache/app-backup/snapper-0.8.16-r1 b/metadata/md5-cache/app-backup/snapper-0.8.16-r1
deleted file mode 100644
index 31bd859e5cb8..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.8.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=7
-HOMEPAGE=http://snapper.io/
-IUSE=doc lvm pam test systemd xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openSUSE/snapper/archive/v0.8.16.tar.gz -> snapper-0.8.16.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aada5f39e0a158bb5354008ab8460ad2
diff --git a/metadata/md5-cache/app-backup/snapper-0.9.0-r1 b/metadata/md5-cache/app-backup/snapper-0.9.0-r1
deleted file mode 100644
index ef693a19fb03..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=7
-HOMEPAGE=http://snapper.io/
-IUSE=doc lvm pam test systemd xattr
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openSUSE/snapper/archive/v0.9.0.tar.gz -> snapper-0.9.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8a0ecace306d41ae423a32afcc64655a
diff --git a/metadata/md5-cache/app-backup/snapper-0.9.1 b/metadata/md5-cache/app-backup/snapper-0.9.1
index cad73240e2c6..5289af145885 100644
--- a/metadata/md5-cache/app-backup/snapper-0.9.1
+++ b/metadata/md5-cache/app-backup/snapper-0.9.1
@@ -5,11 +5,11 @@ DESCRIPTION=Command-line program for btrfs and lvm snapshot management
 EAPI=7
 HOMEPAGE=http://snapper.io/
 IUSE=doc lvm pam test systemd xattr
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.9.1.tar.gz -> snapper-0.9.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=07d28f347a2d4372a2ada5bc680af176
+_md5_=8a0ecace306d41ae423a32afcc64655a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 9183c08422fe..06eecf834969 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/age-1.0.0_rc2 b/metadata/md5-cache/app-crypt/age-1.0.0_rc2
deleted file mode 100644
index 40a09101d8f3..000000000000
--- a/metadata/md5-cache/app-crypt/age-1.0.0_rc2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=A simple, modern and secure encryption tool (and Go library)
-EAPI=7
-HOMEPAGE=https://github.com/FiloSottile/age
-KEYWORDS=~amd64
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/FiloSottile/age/archive/v1.0.0-rc.2.tar.gz -> age-1.0.0_rc2.tar.gz mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-beta.3.zip -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-beta.3.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.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-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/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/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-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
-_md5_=4515966069eb695914a131816c37e271
diff --git a/metadata/md5-cache/app-crypt/age-1.0.0_rc3 b/metadata/md5-cache/app-crypt/age-1.0.0_rc3
deleted file mode 100644
index f0867e64f139..000000000000
--- a/metadata/md5-cache/app-crypt/age-1.0.0_rc3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-go/gox >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install test unpack
-DESCRIPTION=A simple, modern and secure encryption tool (and Go library)
-EAPI=7
-HOMEPAGE=https://github.com/FiloSottile/age
-KEYWORDS=~amd64
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/FiloSottile/age/archive/v1.0.0-rc.3.tar.gz -> age-1.0.0_rc3.tar.gz mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-beta.3.zip -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip mirror://goproxy//filippo.io/edwards25519/@v/v1.0.0-beta.3.mod -> filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.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-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/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/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-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod
-_eclasses_=go-module	34c2d0a98b291ac9acda0cb54c9ffd61
-_md5_=4515966069eb695914a131816c37e271
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.4 b/metadata/md5-cache/app-crypt/libmd-1.0.4
index 912a3e94ffde..e97a92fa0fb9 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.4
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.4
@@ -3,9 +3,9 @@ DESCRIPTION=Message Digest functions from BSD systems
 EAPI=8
 HOMEPAGE=https://www.hadrons.org/software/libmd/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~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=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
 SLOT=0
 SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.4.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=713fa830c29b0d000faf2854be06e32e
+_md5_=d9bf129fc1744a909195412ba04ba3b5
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.4.1 b/metadata/md5-cache/app-crypt/nitrocli-0.4.1
index 9127fffa9345..7f8edcbd5879 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.4.1
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=A command line tool for interacting with Nitrokey devices.
 EAPI=8
 HOMEPAGE=https://github.com/d-e-s-o/nitrocli
 IUSE=debug
-KEYWORDS=amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Apache-2.0 BSD-2 CC0-1.0 GPL-3+ LGPL-3 MIT
 RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.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/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-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/envy/0.4.2/download -> envy-0.4.2.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.94/download -> libc-0.2.94.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.0.crate https://crates.io/api/v1/crates/merge/0.1.0/download -> merge-0.1.0.crate https://crates.io/api/v1/crates/merge_derive/0.1.0/download -> merge_derive-0.1.0.crate https://crates.io/api/v1/crates/nitrocli/0.4.1/download -> nitrocli-0.4.1.crate https://crates.io/api/v1/crates/nitrokey/0.9.0/download -> nitrokey-0.9.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.6.0/download -> nitrokey-sys-3.6.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.5.0/download -> nitrokey-test-0.5.0.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.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/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/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.26/download -> proc-macro2-1.0.26.crate https://crates.io/api/v1/crates/progressing/3.0.2/download -> progressing-3.0.2.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.8/download -> redox_syscall-0.2.8.crate https://crates.io/api/v1/crates/redox_termios/0.1.2/download -> redox_termios-0.1.2.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/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/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.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/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/syn/1.0.72/download -> syn-1.0.72.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termion/1.5.6/download -> termion-1.5.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.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.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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/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_=bash-completion-r1	d3a60385655d9b402be765a6de333245	cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=98eb2a956aabad9caea610a1a9dc9b88
+_md5_=9ece6f75f126e99f7fa26bc2b7e4709f
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2
index beb97e109498..189253a23693 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2
@@ -5,10 +5,10 @@ DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
 EAPI=7
 HOMEPAGE=http://trousers.sourceforge.net
 IUSE=nls pkcs11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~s390 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~m68k ~s390 x86
 LICENSE=CPL-1.0
 RDEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl:0= pkcs11? ( dev-libs/opencryptoki )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/tpm-tools/tpm-tools-1.3.9.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d8665a0dbadd02324e4c33c5b16def12
+_md5_=c20e88fe4205e4648faaf8745464c041
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0 b/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
index 93b0b84383ac..8f6695cfcecf 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
 EAPI=7
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
 IUSE=doc +fapi +openssl mbedtls static-libs test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( mbedtls openssl ) fapi? ( openssl !mbedtls )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/3.1.0/tpm2-tss-3.1.0.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=8acceef58e9e4cf62864b7739439b269
+_md5_=cd21dc5cf1c7f72996264d3269b6e51f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5f721d534386..f9fc3abd1df8 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/conmon-2.0.31 b/metadata/md5-cache/app-emulation/conmon-2.0.31
new file mode 100644
index 000000000000..3e75e4fc50fa
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v2.0.31.tar.gz -> conmon-2.0.31.tar.gz
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a5941db4388412d2d633ebb6c8c5099f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.28-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.28-r1
index 0b2e23de5989..d1eba743aeec 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.28-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.28-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Family of powerful x86 virtualization products for enterprise and ho
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) !app-emulation/virtualbox-bin acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.28 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/VirtualBox-6.1.28.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d17552da088362671c2951a3d94a6493
+_md5_=a20e77c936664456413f4d856d224822
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
index e41a60cdfbea..a34e1f6c52b3 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=CD image containing guest additions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
 RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
 RESTRICT=mirror
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/VBoxGuestAdditions_6.1.28.iso
-_md5_=9a3ebdc4f46e6d0d0728925a64b6731e
+_md5_=cfd446e0a657e55639e3e35b35c056bb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
index fd5bed54da16..4d69e1c7344e 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=PUEL
 RDEPEND==app-emulation/virtualbox-6.1.28*
 RESTRICT=bindist mirror strip
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/Oracle_VM_VirtualBox_Extension_Pack-6.1.28.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.28.tar.gz
-_md5_=dd4ab2845ea226aae4bd27069e0ffac8
+_md5_=fee6287a9e95bc0937879df0fd5a8c68
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
index 83b6a3c92add..42c5f35d1f54 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
@@ -5,11 +5,11 @@ DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=X kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
 RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.28/VirtualBox-6.1.28.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=461efe0d1f7e7c52d3b739d39e645ef7
+_md5_=e34a68ef59705bcb945c5367ee230ccd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
index 7d3eef94231f..26edcc83606a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel Modules for Virtualbox
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
 IUSE=pax-kernel kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.28.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddbe0a12f0704314ed8f71d00594f8fc
+_md5_=ee0d27933603e37aed81c6c03dc3e8f4
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index ab2c6c4fa40c..ebc4a23ef75a 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-vdr-0.0.3 b/metadata/md5-cache/app-eselect/eselect-vdr-0.0.3
deleted file mode 100644
index 3d07fe4c213b..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-vdr-0.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the VDR plugins
-EAPI=5
-HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/?h=eselect-module
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-vdr-0.0.3.tar.bz2
-_md5_=e161a71b6a9910e55dd1db3e0fd3ab08
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 47189fc423c8..111fce119699 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/man-pages-zh_CN-1.6.3.6 b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.6
index 713aeaa95a87..85313543b186 100644
--- a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.6
+++ b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
 EAPI=8
 HOMEPAGE=https://github.com/man-pages-zh/manpages-zh
-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=FDL-1.2
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=https://github.com/man-pages-zh/manpages-zh/archive/v1.6.3.6.tar.gz -> man-pages-zh_CN-1.6.3.6.tar.gz
-_md5_=6867c9a908d856fa6904f1369cb25464
+_md5_=ea8367602ab4a84032042c22e0e6dbb6
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fe62d327260e..7b457a4c082c 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/beep-1.4.9-r1 b/metadata/md5-cache/app-misc/beep-1.4.9-r1
index 5673a226a79f..47ad9541ea1e 100644
--- a/metadata/md5-cache/app-misc/beep-1.4.9-r1
+++ b/metadata/md5-cache/app-misc/beep-1.4.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced PC speaker beeper
 EAPI=7
 HOMEPAGE=https://github.com/spkr-beep
 IUSE=+filecaps
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=filecaps? ( sys-libs/libcap )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/spkr-beep/beep/archive/v1.4.9.tar.gz -> beep-1.4.9.tar.gz
 _eclasses_=fcaps	ac252c3cc67b265cd7ea456f8d58e150	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f4186290d7df779d0979621b506d9f3
+_md5_=e588ca9779b69c890a4c7b1c5c597d6e
diff --git a/metadata/md5-cache/app-misc/rundeck-bin-2.6.8 b/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
deleted file mode 100644
index 0de8049cdf23..000000000000
--- a/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3 app-arch/rpm2targz
-DESCRIPTION=Job Scheduler and Runbook Automation
-EAPI=5
-HOMEPAGE=http://www.rundeck.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://download.rundeck.org/rpm/rundeck-2.6.8-1.20.GA.noarch.rpm http://download.rundeck.org/rpm/rundeck-config-2.6.8-1.20.GA.noarch.rpm
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	rpm	f73e907469f65e52192f110dec72dce0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a7340557206bc57daae02b23abac7ca
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.3-r2 b/metadata/md5-cache/app-misc/wcd-6.0.3-r2
index 1981deeb59f6..3c3c99620e8b 100644
--- a/metadata/md5-cache/app-misc/wcd-6.0.3-r2
+++ b/metadata/md5-cache/app-misc/wcd-6.0.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Wherever Change Directory
 EAPI=7
 HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
 IUSE=nls unicode
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)?] unicode? ( dev-libs/libunistring:= )
 SLOT=0
 SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.3.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cce1742ce4af7898562bfe1551aac81c
+_md5_=d8415aed242bb84afc81481675ccedb0
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index df590ac3351b..27346345757b 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/texstudio-4.0.2 b/metadata/md5-cache/app-office/texstudio-4.0.2
index e9cd55c40c74..c556652799a1 100644
--- a/metadata/md5-cache/app-office/texstudio-4.0.2
+++ b/metadata/md5-cache/app-office/texstudio-4.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
 EAPI=7
 HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
 IUSE=video
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler:=[qt5] >=dev-libs/quazip-0.7.3-r1:0= dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( >=media-libs/phonon-4.11.0 ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/4.0.2.tar.gz -> texstudio-4.0.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=143d9479d29781d0a2685ddcf3f290a2
+_md5_=3f39226c4769ef08c7181240d5f0617d
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index b973afdab2b9..b34c38d96372 100644
Binary files a/metadata/md5-cache/app-officeext/Manifest.gz and b/metadata/md5-cache/app-officeext/Manifest.gz differ
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.56 b/metadata/md5-cache/app-officeext/ooofbtools-2.56
deleted file mode 100644
index 14a3e5c10792..000000000000
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.56
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) app-arch/unzip
-DESCRIPTION=Open/LibreOffice extension for the FictionBook2 format with validation
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/fbtools/
-IUSE=office_implementation_libreoffice
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-arch/zip dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) )
-REQUIRED_USE=|| ( office_implementation_libreoffice )
-SLOT=0
-SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.56.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	office-ext-r1	f7003886a433c084c1dc25d51c4e37c3	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f0d81e99e87b5ebdfebc4bd5e99516f
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 9d346087756d..6b51e6c8abbb 100644
Binary files a/metadata/md5-cache/app-pda/Manifest.gz and b/metadata/md5-cache/app-pda/Manifest.gz differ
diff --git a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2 b/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
deleted file mode 100644
index 7597331e1530..000000000000
--- a/metadata/md5-cache/app-pda/gnupod-0.99.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( media-video/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A collection of Perl-scripts for iPod
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnupod/
-IUSE=aac ffmpeg flac mp3 ogg
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( media-video/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://blinkenlights.ch/gnupod-dist/stable/gnupod-0.99.8.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=54d95adaa297ab978f0d76c978ebd9db
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 537ce3ebcffc..80ec59765f04 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/dash-0.5.11.5 b/metadata/md5-cache/app-shells/dash-0.5.11.5
index fd4dd306e0dd..4b73b3927ffa 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.11.5
+++ b/metadata/md5-cache/app-shells/dash-0.5.11.5
@@ -5,10 +5,10 @@ DESCRIPTION=Debian Almquist Shell
 EAPI=7
 HOMEPAGE=http://gondor.apana.org.au/~herbert/dash/
 IUSE=libedit static
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.5.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b887a929adf2f01b33ce28df7fc0a368
+_md5_=ad8280feaaeb300b5974d8607a0498eb
diff --git a/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1 b/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
index 747112903bf0..f9913a270134 100644
--- a/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
+++ b/metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A Perl-based tool to Render DocBook/XML
 EAPI=8
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/docmake/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-perl/Class-XSAccessor virtual/perl-Getopt-Long virtual/perl-File-Path dev-perl/Path-Tiny dev-perl/Test-Trap dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/App-XML-DocBook-Builder-0.1003.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=4c7339727a631357ef92345db52a4b9b
+_md5_=ac8c1edb1eb3202482d9942b89b97282
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b36459f6827a..bc343e4c586b 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.12 b/metadata/md5-cache/app-text/dvisvgm-2.12
index 550ed9b29900..c378b4e538a6 100644
--- a/metadata/md5-cache/app-text/dvisvgm-2.12
+++ b/metadata/md5-cache/app-text/dvisvgm-2.12
@@ -5,10 +5,10 @@ DESCRIPTION=Converts DVI files to SVG
 EAPI=7
 HOMEPAGE=https://dvisvgm.de/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 RDEPEND=>=app-arch/brotli-1.0.5:= app-text/ghostscript-gpl:= dev-libs/kpathsea:= dev-libs/openssl:= >=dev-libs/xxhash-0.6.5 >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 >=media-libs/woff2-1.0.2 sys-libs/zlib virtual/tex-base
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.12/dvisvgm-2.12.tar.gz
-_md5_=cf8679fe249e88cbb67099a30c33c84c
+_md5_=afb8c35ff2f49f36cc69f45cc1cde1ed
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
index 7616070b9409..213d3e9af1e8 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interpreter for the PostScript language and PDF
 EAPI=8
 HOMEPAGE=https://ghostscript.com/
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/9.55
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/ghostscript-9.55.0.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.55-patchset-01.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9a0bd9d99053c10baba85f9f345c15d0
+_md5_=de9e614c3595760b1ecdc8b98a000c83
diff --git a/metadata/md5-cache/app-text/libgepub-0.6.0 b/metadata/md5-cache/app-text/libgepub-0.6.0
index 2850cccd6370..37c15f43c95f 100644
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ b/metadata/md5-cache/app-text/libgepub-0.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=GObject based library for handling and rendering epub documents
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgepub
 IUSE=+introspection
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgepub/0.6/libgepub-0.6.0.tar.xz
 _eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=758f15f94e01e9da42232d10d6407c16
+_md5_=ef756aee3a2c04835a31f8ad18ebdb33
diff --git a/metadata/md5-cache/app-text/mupdf-1.19.0 b/metadata/md5-cache/app-text/mupdf-1.19.0
index 6b0a26bb4091..a8e39d01277f 100644
--- a/metadata/md5-cache/app-text/mupdf-1.19.0
+++ b/metadata/md5-cache/app-text/mupdf-1.19.0
@@ -12,4 +12,4 @@ REQUIRED_USE=opengl? ( javascript )
 SLOT=0/1.19.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.19.0-source.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8d480fd8772ddb9fa3112da8ca2da0ad
+_md5_=69e43d1240ee68d97f997e2eb6cb297a
diff --git a/metadata/md5-cache/app-text/poppler-21.07.0 b/metadata/md5-cache/app-text/poppler-21.07.0
deleted file mode 100644
index 122c439de210..000000000000
--- a/metadata/md5-cache/app-text/poppler-21.07.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) boost? ( dev-libs/boost )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=7
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/111
-SRC_URI=https://poppler.freedesktop.org/poppler-21.07.0.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a826a2657f176e41ff4be1d8bc4e75e7
diff --git a/metadata/md5-cache/app-text/t1utils-1.42 b/metadata/md5-cache/app-text/t1utils-1.42
index 659167808271..f9e31a57f915 100644
--- a/metadata/md5-cache/app-text/t1utils-1.42
+++ b/metadata/md5-cache/app-text/t1utils-1.42
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=Type 1 Font utilities
 EAPI=7
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.42.tar.gz
-_md5_=96ac82ccf818b0e5aa96010f27e10125
+_md5_=a8166770bbe8a5253dee55a3ff2e1814
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 2d3c096566fe..5aa48a917a63 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/bash-support-4.3 b/metadata/md5-cache/app-vim/bash-support-4.3
new file mode 100644
index 000000000000..c3e9ea1ace90
--- /dev/null
+++ b/metadata/md5-cache/app-vim/bash-support-4.3
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
+EAPI=7
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24452 -> bash-support-4.3.zip
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=e9f097f2d4a9dc8f081a8629adbd1609
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-5.0 b/metadata/md5-cache/app-vim/lustyexplorer-5.0
new file mode 100644
index 000000000000..d59b8b2c3cc8
--- /dev/null
+++ b/metadata/md5-cache/app-vim/lustyexplorer-5.0
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
+EAPI=7
+HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
+KEYWORDS=~amd64 ~x86
+LICENSE=bufexplorer.vim
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=26146 -> lusty-explorer-5.0.zip
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=d900bc96010ca78e951d6812dd425977
diff --git a/metadata/md5-cache/app-vim/tlib-1.27 b/metadata/md5-cache/app-vim/tlib-1.27
new file mode 100644
index 000000000000..84ec914d5246
--- /dev/null
+++ b/metadata/md5-cache/app-vim/tlib-1.27
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a library of utility functions
+EAPI=7
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.27.tar.gz -> tlib-1.27.tar.gz
+_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_md5_=f902e9345e1e5bf618720dffd3b4018c
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 7504ab8b25dc..4022f02b369b 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/langkit-22.0.0 b/metadata/md5-cache/dev-ada/langkit-22.0.0
new file mode 100644
index 000000000000..9d3af87f29ca
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/langkit-22.0.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/funcy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DESCRIPTION=A Python framework to generate language parsers
+EAPI=7
+HOMEPAGE=https://www.adacore.com/community
+IUSE=python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/funcy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-ada/e3-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AdaCore/langkit/archive/refs/tags/v22.0.0.tar.gz -> langkit-22.0.0.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=a2ced4a93a37836c6f557452aac803bc
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 442cb58cb7e4..4f35d98f7180 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/asio-1.20.0 b/metadata/md5-cache/dev-cpp/asio-1.20.0
index 81095a488d3f..3e975d69b58a 100644
--- a/metadata/md5-cache/dev-cpp/asio-1.20.0
+++ b/metadata/md5-cache/dev-cpp/asio-1.20.0
@@ -4,9 +4,9 @@ DESCRIPTION=Asynchronous Network Library
 EAPI=8
 HOMEPAGE=https://think-async.com https://github.com/chriskohlhoff/asio
 IUSE=doc examples test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asio/asio/asio-1.20.0.tar.bz2
-_md5_=d9dc0a9b141e314241dd67b9e2704879
+_md5_=f7b5a295acf66b5b13fa9ff201c9fb3b
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.11.0 b/metadata/md5-cache/dev-cpp/gtest-1.11.0
index 55b42ef90898..f030578fbc15 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.11.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Google C++ Testing Framework
 EAPI=8
 HOMEPAGE=https://github.com/google/googletest
 IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz -> gtest-1.11.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0b3b2f1a53dc990489ee4245a809c14c
+_md5_=e2e3e05926cefcb191434ef954203197
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a008bbd3e114..5983df78174e 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mtop-0.6.6-r3 b/metadata/md5-cache/dev-db/mtop-0.6.6-r3
deleted file mode 100644
index c82945a1932c..000000000000
--- a/metadata/md5-cache/dev-db/mtop-0.6.6-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=dev-perl/Curses dev-perl/DBI dev-perl/DBD-mysql virtual/perl-libnet dev-lang/perl:=[-build(-)]
-DESCRIPTION=Mysql top monitors a MySQL server
-EAPI=5
-HOMEPAGE=http://mtop.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Curses dev-perl/DBI dev-perl/DBD-mysql virtual/perl-libnet dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/mtop/mtop-0.6.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=541b72bf1ad1eefceba3ac44369a4c62
diff --git a/metadata/md5-cache/dev-db/postgis-3.2.0_beta1 b/metadata/md5-cache/dev-db/postgis-3.2.0_beta3
similarity index 99%
rename from metadata/md5-cache/dev-db/postgis-3.2.0_beta1
rename to metadata/md5-cache/dev-db/postgis-3.2.0_beta3
index bf2241a68fc4..4e248f19fa17 100644
--- a/metadata/md5-cache/dev-db/postgis-3.2.0_beta1
+++ b/metadata/md5-cache/dev-db/postgis-3.2.0_beta3
@@ -10,6 +10,6 @@ RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_
 REQUIRED_USE=|| ( postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.2.0beta1.tar.gz
+SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.2.0beta3.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	postgres	3ff7ea72ed39efa38ebaead171fd5da4	postgres-multi	fb7c39e4a2aced93f5986224677a9070	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	user	1033b6bed7cf367c4507ea9a3ff503d0	user-info	2e75eaea3582b052ec16d9d5aa74ced3
 _md5_=5b7d2044d7d23dfa3c3016843f684064
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
index 7b74e6868e40..2a9ac3b9755c 100644
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
@@ -4,11 +4,11 @@ DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A library of routines for managing a database
 EAPI=7
 HOMEPAGE=https://fallabs.com/tokyocabinet/
-IUSE=bzip2 debug doc examples threads zlib
+IUSE=bzip2 doc examples threads zlib
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06b67d643edc63e7fdc60ece7db25f3a
+_md5_=cd748514077ed48e32d14403fa3ab701
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index c0b985d66032..72d0b845485d 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/esptool-3.2 b/metadata/md5-cache/dev-embedded/esptool-3.2
index c8dbbb93514f..e5fb7870b79f 100644
--- a/metadata/md5-cache/dev-embedded/esptool-3.2
+++ b/metadata/md5-cache/dev-embedded/esptool-3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266
 EAPI=8
 HOMEPAGE=https://github.com/espressif/esptool
 IUSE=test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-python/bitstring[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_8(-)] dev-python/pyserial[python_targets_python3_8(-)] dev-python/reedsolomon[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v3.2.tar.gz -> esptool-3.2.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=51509a489e8312b5b727eb9d026095a6
+_md5_=5b44b2ae76443495f7687d5aaa76746b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ec522f325b14..fa0781551485 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/ant-contrib-1.0_beta6_pre20201123 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123
deleted file mode 100644
index cff87cf58be2..000000000000
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/ant-core-1.10.9:0 >=dev-java/ant-ivy-2.3.0:2 >=dev-java/bcel-6.5.0:0 >=dev-java/commons-httpclient-3.1:3 >=dev-java/xerces-2.12.0:2 test? ( >=dev-java/ant-core-1.10.9:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Ant-contrib tasks for Apache Ant
-EAPI=7
-HOMEPAGE=http://ant-contrib.sourceforge.net:80
-IUSE=elibc_FreeBSD doc source test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-core-1.10.9:0 >=dev-java/ant-ivy-2.3.0:2 >=dev-java/bcel-6.5.0:0 >=dev-java/commons-httpclient-3.1:3 >=dev-java/xerces-2.12.0:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
-_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0
-_md5_=c4dad779bbd254a53340318e97f108de
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
new file mode 100644
index 000000000000..4630f28d4d45
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-httpclient:3 dev-java/xerces:2 >=virtual/jdk-1.8:* test? ( dev-java/ant-core:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Ant-contrib tasks for Apache Ant
+EAPI=8
+HOMEPAGE=http://ant-contrib.sourceforge.net
+IUSE=elibc_FreeBSD doc source test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/ant-core:0 dev-java/ant-ivy:2 dev-java/bcel:0 dev-java/commons-httpclient:3 dev-java/xerces:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz -> ant-contrib-1.0_beta6_pre20201123.tar.gz
+_eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0
+_md5_=6af400f942698cd43eab05221d61e09e
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1 b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
deleted file mode 100644
index 7efaf97b139d..000000000000
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Native Runtime Enhanced X-platform I/O
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-enxio
-IUSE=elibc_FreeBSD doc examples source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-enxio/archive/0.7.tar.gz -> jnr-enxio-0.7.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0360ef646c8255ea1ce04044b644bcff
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
deleted file mode 100644
index 1b8ba123f2a5..000000000000
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:2 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Unix sockets for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-unixsocket
-IUSE=elibc_FreeBSD doc examples source test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-unixsocket/archive/0.6.tar.gz -> jnr-unixsocket-0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	e83ca06db890ca292b0b6d43e376e20d	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7836e09796f994737a1d4ea8bd46cd86
diff --git a/metadata/md5-cache/dev-java/mina-core-1.1.7-r1 b/metadata/md5-cache/dev-java/mina-core-1.1.7-r1
deleted file mode 100644
index 562bd0d9560b..000000000000
--- a/metadata/md5-cache/dev-java/mina-core-1.1.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/slf4j-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MINA Project
-EAPI=6
-HOMEPAGE=https://mina.apache.org/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/mina-core-1.1.7.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf60b641f76258dd3a0274a171103efa
diff --git a/metadata/md5-cache/dev-java/mina-core-2.0.7-r1 b/metadata/md5-cache/dev-java/mina-core-2.0.7-r1
deleted file mode 100644
index 96bb0137f38f..000000000000
--- a/metadata/md5-cache/dev-java/mina-core-2.0.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/slf4j-api:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache MINA Project
-EAPI=6
-HOMEPAGE=https://mina.apache.org/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/mina/mina/2.0.7/apache-mina-2.0.7-src.tar.bz2 -> mina-core-2.0.7.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24fb2b2fc0947659c6913c3dbe4b371c
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0-r1 b/metadata/md5-cache/dev-java/swingx-ws-1.0-r1
deleted file mode 100644
index e61faf8a93a8..000000000000
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-httpclient:3 dev-java/jdom:0 dev-java/json:0 dev-java/jtidy:0 dev-java/rome:0 dev-java/swingx:1.6 dev-java/swingx-beaninfo:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Utilities and widgets to integrate Swing GUIs with web applications
-EAPI=6
-HOMEPAGE=https://java.net/projects/swingx-ws/
-IUSE=elibc_FreeBSD doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/commons-httpclient:3 dev-java/jdom:0 dev-java/json:0 dev-java/jtidy:0 dev-java/rome:0 dev-java/swingx:1.6 dev-java/swingx-beaninfo:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://central.maven.org/maven2/org/swinglabs/swingx-ws/1.0/swingx-ws-1.0-sources.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fda1ea2cf95461f85bdf8e7cd631d784
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 502c8847efba..77cb96f9377e 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/python-3.10.1 b/metadata/md5-cache/dev-lang/python-3.10.1
new file mode 100644
index 000000000000..573afe4e79d5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.10
+SRC_URI=https://www.python.org/ftp/python/3.10.1/Python-3.10.1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.1/Python-3.10.1.tar.xz.asc )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ad2a4fdda1a8030c30e3139fdb4851f4
diff --git a/metadata/md5-cache/dev-lang/rust-1.57.0 b/metadata/md5-cache/dev-lang/rust-1.57.0
new file mode 100644
index 000000000000..0f61407a5392
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.57.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.56* =dev-lang/rust-bin-1.56* =dev-lang/rust-1.57* =dev-lang/rust-bin-1.57* ) ) !system-llvm? ( >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) verify-sig? ( app-crypt/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
+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.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	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	rust-toolchain	f8649e83cfccc3989141e2437a787c88	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=71db38b12da74720c47847a9cf84df1b
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.57.0 b/metadata/md5-cache/dev-lang/rust-bin-1.57.0
new file mode 100644
index 000000000000..44753b44bb2c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.57.0
@@ -0,0 +1,13 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( app-crypt/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=7
+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
+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.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	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	prefix	d04f14b297013ad1410550c0757f14f8	rust-toolchain	f8649e83cfccc3989141e2437a787c88	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=e1f7db57fd6e9352dac8fd340b01e82a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a7d4d3b1ebda..cc131cc9f38b 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/boehm-gc-8.0.6 b/metadata/md5-cache/dev-libs/boehm-gc-8.0.6
index d3df7ecf85cc..5b64858aa657 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-8.0.6
+++ b/metadata/md5-cache/dev-libs/boehm-gc-8.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=7
 HOMEPAGE=https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
 IUSE=cxx +large static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=boehm-gc
 RDEPEND=>=dev-libs/libatomic_ops-7.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v8.0.6/gc-8.0.6.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ea59913e0c89524cb8a0039eeda64930
+_md5_=dbbedc8150fe47e9902b086d824270bb
diff --git a/metadata/md5-cache/dev-libs/boost-1.77.0-r4 b/metadata/md5-cache/dev-libs/boost-1.77.0-r4
index 840403aa5476..447bd655464f 100644
--- a/metadata/md5-cache/dev-libs/boost-1.77.0-r4
+++ b/metadata/md5-cache/dev-libs/boost-1.77.0-r4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1.77.0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/boost/boost-1.77.0-patches-1.tar.xz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=321f5865491fe16e44e28f31ed242c04
+_md5_=cbe9b2bbf888ecb31c1e51964a7392c7
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.6 b/metadata/md5-cache/dev-libs/girara-0.3.6
index 0198d76fbb82..de18bf7638c1 100644
--- a/metadata/md5-cache/dev-libs/girara-0.3.6
+++ b/metadata/md5-cache/dev-libs/girara-0.3.6
@@ -5,11 +5,11 @@ DESCRIPTION=UI library that focuses on simplicity and minimalism
 EAPI=7
 HOMEPAGE=https://pwmt.org/projects/girara/
 IUSE=doc libnotify test test
-KEYWORDS=amd64 ~arm ~riscv x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= >=x11-libs/gtk+-3.20:3 libnotify? ( x11-libs/libnotify )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pwmt.org/projects/girara/download/girara-0.3.6.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=505dabee9844fb4ec8ef68ced27042dc
+_md5_=c097e68a6786a1bccf5fca3ce4163661
diff --git a/metadata/md5-cache/dev-libs/libmanette-0.2.6 b/metadata/md5-cache/dev-libs/libmanette-0.2.6
index 486abaf214c7..1bf3c31a0b35 100644
--- a/metadata/md5-cache/dev-libs/libmanette-0.2.6
+++ b/metadata/md5-cache/dev-libs/libmanette-0.2.6
@@ -5,7 +5,7 @@ DESCRIPTION=Simple GObject game controller library
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/aplazas/libmanette
 IUSE=gtk-doc +introspection +udev +vala test
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50:2 udev? ( dev-libs/libgudev[introspection?] ) dev-libs/libevdev introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libmanette/0.2/libmanette-0.2.6.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	ba63120449f0238a2f0c39303871ad99	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=7775f5774e558c9ea7acb04bb162cd1b
+_md5_=eab6b5db86f341c88967ef127237f0db
diff --git a/metadata/md5-cache/dev-libs/libphonenumber-8.12.37 b/metadata/md5-cache/dev-libs/libphonenumber-8.12.37
index 1271dc78337c..6ff0f6eafdb5 100644
--- a/metadata/md5-cache/dev-libs/libphonenumber-8.12.37
+++ b/metadata/md5-cache/dev-libs/libphonenumber-8.12.37
@@ -5,11 +5,11 @@ DESCRIPTION=Library for parsing, formatting, and validating international phone
 EAPI=8
 HOMEPAGE=https://github.com/google/libphonenumber
 IUSE=test
-KEYWORDS=amd64 arm64
+KEYWORDS=amd64 arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/icu:= dev-libs/protobuf:= dev-libs/boost:=
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/libphonenumber/archive/v8.12.37.tar.gz -> libphonenumber-8.12.37.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a71b025ad98a66bc7f0c8cbddb39cdf0
+_md5_=ab98fe96ca2214c81500494eb7c8ecf0
diff --git a/metadata/md5-cache/dev-libs/libthreadar-1.3.5 b/metadata/md5-cache/dev-libs/libthreadar-1.3.5
index 0c447277aa4e..b65fd87f4c0e 100644
--- a/metadata/md5-cache/dev-libs/libthreadar-1.3.5
+++ b/metadata/md5-cache/dev-libs/libthreadar-1.3.5
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Threading library used by dar archiver
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/libthreadar/
-KEYWORDS=amd64 ~ppc sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/libthreadar/libthreadar-1.3.5.tar.gz
-_md5_=9402925c6fa7af498b34d4149b97aca2
+_md5_=7a5227758079a6861e3912d8898f59ae
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.12 b/metadata/md5-cache/dev-libs/libwacom-1.12
index 958f22375395..cef133146875 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.12
+++ b/metadata/md5-cache/dev-libs/libwacom-1.12
@@ -5,11 +5,11 @@ DESCRIPTION=Library for identifying Wacom tablets and their model-specific featu
 EAPI=8
 HOMEPAGE=https://github.com/linuxwacom/libwacom
 IUSE=doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.12/libwacom-1.12.tar.bz2
 _eclasses_=meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=88fb016202d708d4248c5fd67c5b0be9
+_md5_=a27f44780a14fa029547e55c8a52a9cc
diff --git a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904 b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
deleted file mode 100644
index 66be61926ba2..000000000000
--- a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 ) test? ( dev-python/lit ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=LLVM intrinsics representing SIMD semantics of a program targeting GPU
-EAPI=7
-HOMEPAGE=https://github.com/intel/vc-intrinsics
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=https://github.com/intel/vc-intrinsics/archive/830067832d4af0fbd5710e9a45669a02fcfb7c3f.tar.gz -> vc-intrinsics-0_p20200904.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a5b9aff9177091ef0437b665eaa82fe3
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 4eed6d9fa1eb..12e840355ad0 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/fix-20211125 b/metadata/md5-cache/dev-ml/fix-20211125
new file mode 100644
index 000000000000..5484e1752f31
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/fix-20211125
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Facilities for memoization and fixed points
+EAPI=7
+HOMEPAGE=https://gitlab.inria.fr/fpottier/fix
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/20211125
+SRC_URI=https://gitlab.inria.fr/fpottier/fix/-/archive/20211125/fix-20211125.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=592871dd04a43c54c7fd444bc0fd88fc
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.6 b/metadata/md5-cache/dev-ml/merlin-extend-0.6
deleted file mode 100644
index 52b607e20734..000000000000
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=SDK to extend Merlin
-EAPI=7
-HOMEPAGE=https://github.com/let-def/merlin-extend
-IUSE=ocamlopt
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-lang/ocaml:= dev-lang/ocaml:=[ocamlopt?]
-SLOT=0/0.6
-SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.6.tar.gz -> merlin-extend-0.6.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=021b19cd60fdffaeef4bc729b73ca661
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1 b/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
new file mode 100644
index 000000000000..23b0efe99e8e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=SDK to extend Merlin
+EAPI=7
+HOMEPAGE=https://github.com/let-def/merlin-extend
+IUSE=ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-lang/ocaml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/0.6
+SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.6.tar.gz -> merlin-extend-0.6.tar.gz
+_eclasses_=dune	a0084192fdb9ca5fa2c89584f757b3b2
+_md5_=86ab2ec7f73cd6f63546ed2df0986e74
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-2.420.0 b/metadata/md5-cache/dev-perl/Alien-Build-2.420.0
index 435fc2fc786c..6116f6ccfab7 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-2.420.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-2.420.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build external dependencies for use in CPAN
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 IUSE=minimal zip test examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.42.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=5b85d3d13c451c34fdf9c32962ac0dd6
+_md5_=17127c4cc6a94a9a656130eb2637739b
diff --git a/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0 b/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
index 3164e60ec925..148a6c33cb0e 100644
--- a/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
+++ b/metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
@@ -5,11 +5,11 @@ DESCRIPTION=Generic archive extracting mechanism
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Archive-Extract
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IPC-Cmd-0.640.0 virtual/perl-Locale-Maketext-Simple >=virtual/perl-Module-Load-Conditional-0.660.0 >=virtual/perl-Params-Check-0.70.0 virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.88.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=df617db0daf5e56081adaa5172905769
+_md5_=2ff980daa49e2138a9fb97b7399f1681
diff --git a/metadata/md5-cache/dev-perl/CGI-4.530.0 b/metadata/md5-cache/dev-perl/CGI-4.530.0
index fa267cc930a7..4fe9f25b079e 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.530.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.530.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Common Gateway Interface Class
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/CGI
 IUSE=test examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.53.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=224b0bca3661797a1702d615161b4e46
+_md5_=85bebe48cd5622852ede122e5bf9abf5
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
index 8a1db0552bfa..959af89aa7cc 100644
--- a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
+++ b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
@@ -5,11 +5,11 @@ DESCRIPTION=Inheritable, overridable class data
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Class-Data-Inheritable
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSHERER/Class-Data-Inheritable-0.09.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=900750aaf7afa090ef41e3c28396c392
+_md5_=708a0024bfa9c892def3e4e599115c0d
diff --git a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1 b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
index 529e1fd4b1b5..065f5e89e339 100644
--- a/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Generate fast XS accessors without runtime compilation
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-XSAccessor
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ppc ~ppc64 ~riscv x86 ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ~mips ppc ~ppc64 ~riscv x86 ~ppc-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Time-HiRes virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=c8091bd0a53249475ca76caf56b81b35
+_md5_=30cfcdee8df831a37a71cd6dd050f851
diff --git a/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0 b/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
index e1ce812a5ac2..68b8e0ae23a9 100644
--- a/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
+++ b/metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
@@ -5,11 +5,11 @@ DESCRIPTION=Read/Write .ini style files with as little code as possible
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Config-Tiny
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-File-Spec-3.300.0 >=virtual/perl-File-Temp-0.220.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.27.tgz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=4432faa4b9e3b5c88e0c96194a017d40
+_md5_=66e9bc22718e739d1b458623e961286b
diff --git a/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0 b/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
index 74119f3885d5..01e874b37907 100644
--- a/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
+++ b/metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
@@ -5,11 +5,11 @@ DESCRIPTION=Standard en/decode of ASN.1 structures
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Convert-ASN1
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=dac03403aa1c348a8a9662471d421a64
+_md5_=3bb7a7271ebc95a0472c5c8423774442
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
index 1928e3145b47..12aae9d741fa 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
@@ -5,11 +5,11 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.160.0 virtual/perl-Carp >=virtual/perl-Encode-1.980.100 virtual/perl-Exporter virtual/perl-XSLoader >=virtual/perl-podlators-2.80.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.27.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=56df199d1746229a6144503c350eb50d
+_md5_=36b8d1c0018bd6e20c51d744053d68d3
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
index 2de12c69feb2..7654485c955e 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
@@ -5,11 +5,11 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/DBD-SQLite
 IUSE=system-sqlite test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.35.5[extensions(+)] ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.70.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=c5f5036a335294993ddceab88b6ff3e5
+_md5_=56effd8deb3c47cdfdc1baed60a18770
diff --git a/metadata/md5-cache/dev-perl/Data-OptList-0.112.0 b/metadata/md5-cache/dev-perl/Data-OptList-0.112.0
index fe25a2bc217d..430612dd4553 100644
--- a/metadata/md5-cache/dev-perl/Data-OptList-0.112.0
+++ b/metadata/md5-cache/dev-perl/Data-OptList-0.112.0
@@ -5,11 +5,11 @@ DESCRIPTION=parse and validate simple name/value option pairs
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Data-OptList
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Sub-Install-0.921.0 dev-perl/Params-Util virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.112.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=2aaa28cad345b70a897f90d73a9cf187
+_md5_=77baa79eb974bb73b8aa5fcd91d2ff71
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.500.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.500.0
index 5540387801fa..01f72083846d 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.500.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-2.500.0
@@ -5,11 +5,11 @@ DESCRIPTION=Time zone object base class and factory
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/DateTime-TimeZone
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Singleton-1.30.0 >=virtual/perl-File-Spec-3.0.0 dev-perl/Module-Runtime >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Specio-0.150.0 dev-perl/Try-Tiny dev-perl/namespace-autoclean virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.50.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=dde78b1ef44ea2ffe76c23890056c8e4
+_md5_=65a30708adfe385d94584573e9988d52
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckOS-1.870.0 b/metadata/md5-cache/dev-perl/Devel-CheckOS-1.870.0
index 63af4e22bcd1..f6eb7e93e78a 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckOS-1.870.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckOS-1.870.0
@@ -5,11 +5,11 @@ DESCRIPTION=Check what OS we're running on
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Devel-CheckOS
 IUSE=test
-KEYWORDS=amd64 ~ia64 ppc ~sparc x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Find-Rule-0.280.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.87.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=63ce37731201d6dea06fd3ec80d2bfeb
+_md5_=d8e4fe9325ce303437604dbf7d0d8c1d
diff --git a/metadata/md5-cache/dev-perl/File-BaseDir-0.90.0 b/metadata/md5-cache/dev-perl/File-BaseDir-0.90.0
index 5c50007862b9..074b8fc2c961 100644
--- a/metadata/md5-cache/dev-perl/File-BaseDir-0.90.0
+++ b/metadata/md5-cache/dev-perl/File-BaseDir-0.90.0
@@ -5,11 +5,11 @@ DESCRIPTION=Use the Freedesktop.org base directory specification
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/File-BaseDir
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec dev-perl/IPC-System-Simple dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/File-BaseDir-0.09.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3058d09d00cc79412c228c5ca4d1f7c7
+_md5_=fc41e27008451ba447b99db22f81f3b4
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 8ad76b5adbeb..658dc172ff00 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/Mouse-2.5.10 b/metadata/md5-cache/dev-perl/Mouse-2.5.10
index 9e004f4f5211..631cd39a2959 100644
--- a/metadata/md5-cache/dev-perl/Mouse-2.5.10
+++ b/metadata/md5-cache/dev-perl/Mouse-2.5.10
@@ -5,11 +5,11 @@ DESCRIPTION=Moose minus the antlers
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mouse
 IUSE=test examples
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Scalar-List-Utils-1.140.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.10.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=b77c2269bfcf32103c7338d84a5fda02
+_md5_=361b2d70efc880ab4d2ca2037457b645
diff --git a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.634.0 b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.634.0
index e46cafafadf7..04904d570511 100644
--- a/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.634.0
+++ b/metadata/md5-cache/dev-perl/Proc-ProcessTable-0.634.0
@@ -5,11 +5,11 @@ DESCRIPTION=Unix process table information
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Proc-ProcessTable
 IUSE=examples test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Storable dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.634.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=02ba4136a9d2f2d6b9bb233cfe08c691
+_md5_=2ce078897f4a6dfc53f26662abcd03f3
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0 b/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0
deleted file mode 100644
index bf9e4fcb7628..000000000000
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Exporter-5.570.0 >=dev-perl/Hash-Merge-0.120.0 virtual/perl-Scalar-List-Utils >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Moo-2.0.1 >=dev-perl/Sub-Quote-2.0.1 >=virtual/perl-Text-Balanced-2.0.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Storable >=dev-perl/Test-Deep-0.101.0 >=dev-perl/Test-Exception-0.310.0 >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Warn ) dev-lang/perl
-DESCRIPTION=Generate SQL from Perl data structures
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/SQL-Abstract
-IUSE=test examples
-KEYWORDS=amd64 ~ppc x86 ~ppc-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Exporter-5.570.0 >=dev-perl/Hash-Merge-0.120.0 virtual/perl-Scalar-List-Utils >=dev-perl/MRO-Compat-0.120.0 >=dev-perl/Moo-2.0.1 >=dev-perl/Sub-Quote-2.0.1 >=virtual/perl-Text-Balanced-2.0.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.84.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=5f99643bde05e67c452e30483f0ae5f0
diff --git a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1 b/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
deleted file mode 100644
index a430d3be2272..000000000000
--- a/metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/SQL-Abstract dev-perl/DBI dev-perl/Module-Build test? ( dev-perl/Test-Deep dev-perl/Test-Exception ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Portable LIMIT emulation
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/SQL-Abstract-Limit
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/SQL-Abstract dev-perl/DBI dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=47a4c40fe79b66388e52159c338915c2
diff --git a/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0 b/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
deleted file mode 100644
index c1edc02ec66e..000000000000
--- a/metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!minimal? ( dev-perl/Math-Base-Convert >=virtual/perl-Math-Complex-1.560.0 >=dev-perl/Text-Soundex-3.40.0 ) virtual/perl-Carp >=dev-perl/Clone-0.300.0 virtual/perl-Data-Dumper dev-perl/Module-Runtime >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-Text-Balanced virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Math-Base-Convert >=virtual/perl-Math-Complex-1.560.0 dev-perl/Test-Deep >=virtual/perl-Test-Simple-0.900.0 >=dev-perl/Text-Soundex-3.40.0 ) dev-lang/perl
-DESCRIPTION=Small SQL parser and engine
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/SQL-Statement
-IUSE=test minimal
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!minimal? ( dev-perl/Math-Base-Convert >=virtual/perl-Math-Complex-1.560.0 >=dev-perl/Text-Soundex-3.40.0 ) virtual/perl-Carp >=dev-perl/Clone-0.300.0 virtual/perl-Data-Dumper dev-perl/Module-Runtime >=dev-perl/Params-Util-1.0.0 >=virtual/perl-Scalar-List-Utils-1.0.0 virtual/perl-Text-Balanced dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=86743798f273b2e233f6f7a45ec0c650
diff --git a/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230 b/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230
deleted file mode 100644
index 30f9f987a8c8..000000000000
--- a/metadata/md5-cache/dev-perl/SQL-Translator-0.110.230
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Carp-Clan >=dev-perl/DBI-1.540.0 virtual/perl-Digest-SHA >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Moo-1.0.3 >=dev-perl/Package-Variant-1.1.1 >=dev-perl/Parse-RecDescent-1.967.9 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote >=dev-perl/Try-Tiny-0.40.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 >=dev-perl/JSON-2 >=dev-perl/XML-Writer-0.500.0 >=dev-perl/YAML-0.660.0 test? ( dev-perl/HTML-Parser >=dev-perl/Spreadsheet-ParseExcel-0.410.0 >=dev-perl/Template-Toolkit-2.200.0 dev-perl/Test-Exception >=dev-perl/Test-Differences-0.310.0 >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/XML-LibXML-1.690.0 ) dev-lang/perl
-DESCRIPTION=Manipulate structured data definitions (SQL and more)
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/SQL-Translator
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Carp-Clan >=dev-perl/DBI-1.540.0 virtual/perl-Digest-SHA >=dev-perl/File-ShareDir-1.0.0 >=dev-perl/Moo-1.0.3 >=dev-perl/Package-Variant-1.1.1 >=dev-perl/Parse-RecDescent-1.967.9 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote >=dev-perl/Try-Tiny-0.40.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-0.11023.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=1b8548c1b7a438564f061cfa32d6e72a
diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-XLSX-0.170.0 b/metadata/md5-cache/dev-perl/Spreadsheet-XLSX-0.170.0
new file mode 100644
index 000000000000..da382645eb3f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Spreadsheet-XLSX-0.170.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-perl/Archive-Zip-1.180.0 dev-perl/Spreadsheet-ParseExcel virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-NoWarnings dev-perl/Test-Warnings ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Perl extension for reading MS Excel 2007 files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Spreadsheet-XLSX
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Archive-Zip-1.180.0 dev-perl/Spreadsheet-ParseExcel dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AS/ASB/Spreadsheet-XLSX-0.17.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=5d2b1e45d51509927488d96b02b4a29e
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
deleted file mode 100644
index 4da46262dab4..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-0.360.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Module of basic descriptive statistical functions
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Statistics-Descriptive
-IUSE=test examples
-KEYWORDS=amd64 ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=348505917d3f0a9592a374ef4e72feee
diff --git a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1 b/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
deleted file mode 100644
index 969062f8c398..000000000000
--- a/metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Statistics-Descriptive-Discrete module
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Statistics-Descriptive-Discrete
-KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RH/RHETTBULL/Statistics-Descriptive-Discrete-0.07.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e2d6ab3aeb30b5e8582d6ea94e9712d
diff --git a/metadata/md5-cache/dev-perl/String-CRC32-1.600.0 b/metadata/md5-cache/dev-perl/String-CRC32-1.600.0
deleted file mode 100644
index cbafea28e254..000000000000
--- a/metadata/md5-cache/dev-perl/String-CRC32-1.600.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Perl interface for cyclic redundancy check generation
-EAPI=8
-HOMEPAGE=https://metacpan.org/release/String-CRC32
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=public-domain
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.6.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=a65854d696e635b051e426e0f12dece8
diff --git a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r2 b/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r2
deleted file mode 100644
index 8d3780610b36..000000000000
--- a/metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Produce common sub-string indices for two strings
-EAPI=8
-HOMEPAGE=https://metacpan.org/release/String-Ediff
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BO/BOXZOU/String-Ediff-0.09.tar.gz
-_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=0ef3096ad084c16baf7d123d7cbd8e42
diff --git a/metadata/md5-cache/dev-perl/String-Formatter-1.234.0 b/metadata/md5-cache/dev-perl/String-Formatter-1.234.0
new file mode 100644
index 000000000000..94d1d523f249
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/String-Formatter-1.234.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Params-Util dev-perl/Sub-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.780.0 test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=build sprintf-like functions of your own
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/String-Formatter
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Params-Util dev-perl/Sub-Exporter dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-1.234.tar.gz
+_eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
+_md5_=077e9ca1f8246dbc3911ffcb2714ed03
diff --git a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0-r1 b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0-r1
index 26f658c13585..4191bab2a13d 100644
--- a/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0-r1
+++ b/metadata/md5-cache/dev-perl/Sys-CPU-0.610.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72
-_md5_=7cd309c4b1a5e15ed231a488e40dc407
+_md5_=c6800ed4f7258903e040898b5f76396b
diff --git a/metadata/md5-cache/dev-perl/Template-Toolkit-3.9.0 b/metadata/md5-cache/dev-perl/Template-Toolkit-3.9.0
index 75b9636760aa..abbb03629f05 100644
--- a/metadata/md5-cache/dev-perl/Template-Toolkit-3.9.0
+++ b/metadata/md5-cache/dev-perl/Template-Toolkit-3.9.0
@@ -5,7 +5,7 @@ DESCRIPTION=The Template Toolkit
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Template-Toolkit
 IUSE=xml gd mysql postgres latex vim-syntax test test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Text-Autoformat vim-syntax? ( app-vim/tt2-syntax ) xml? ( dev-perl/Template-XML ) gd? ( dev-perl/Template-GD ) mysql? ( dev-perl/Template-DBI ) latex? ( dev-perl/Template-Plugin-Latex ) postgres? ( dev-perl/Template-DBI )
 RDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.560.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.009.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=252b5eb7c18ab63770b956d9941b81a2
+_md5_=e1b078ce9e7f0309bee5f264d6729935
diff --git a/metadata/md5-cache/dev-perl/Test-Trap-0.3.4 b/metadata/md5-cache/dev-perl/Test-Trap-0.3.4
index 1db4176a42a2..3e9ab7a18fbc 100644
--- a/metadata/md5-cache/dev-perl/Test-Trap-0.3.4
+++ b/metadata/md5-cache/dev-perl/Test-Trap-0.3.4
@@ -5,11 +5,11 @@ DESCRIPTION=Trap exit codes, exceptions, output, etc
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Test-Trap
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-Dump virtual/perl-Exporter virtual/perl-File-Temp virtual/perl-IO virtual/perl-Test-Simple virtual/perl-version dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=3f23619659ea401b2c797845742bb322
+_md5_=f3fc4112a9c6ea5fd3558301b073937d
diff --git a/metadata/md5-cache/dev-perl/Text-CSV-2.10.0 b/metadata/md5-cache/dev-perl/Text-CSV-2.10.0
index abaef39d27ac..a6e8cc8741de 100644
--- a/metadata/md5-cache/dev-perl/Text-CSV-2.10.0
+++ b/metadata/md5-cache/dev-perl/Text-CSV-2.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=Manipulate comma-separated value strings
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Text-CSV
 IUSE=+xs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=xs? ( >=dev-perl/Text-CSV_XS-1.460.0 ) virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.01.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=c9118bb8db8b8bf17e002888c5c69d26
+_md5_=2e7409b1e442fccfbc937c081f2a8751
diff --git a/metadata/md5-cache/dev-perl/XML-Atom-0.430.0 b/metadata/md5-cache/dev-perl/XML-Atom-0.430.0
index e12a0b6c17db..e737deecaeb9 100644
--- a/metadata/md5-cache/dev-perl/XML-Atom-0.430.0
+++ b/metadata/md5-cache/dev-perl/XML-Atom-0.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=Atom feed and API implementation
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/XML-Atom
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Class-Data-Inheritable dev-perl/DateTime dev-perl/DateTime-TimeZone dev-perl/libwww-perl virtual/perl-MIME-Base64 dev-perl/LWP-Authen-Wsse dev-perl/URI >=dev-perl/XML-LibXML-2.20.200 >=dev-perl/XML-XPath-1.200.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/XML-Atom-0.43.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c
-_md5_=89afa1276160a9bad5604ad8e9ff9bc7
+_md5_=d32a8400f916f9a6da873633b03ff17b
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index f3dfad01d50a..fd5b8f264f0f 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/pecl-event-3.0.2_p1 b/metadata/md5-cache/dev-php/pecl-event-3.0.2_p1
index 3aec72fd2bc9..5f428a8d4874 100644
--- a/metadata/md5-cache/dev-php/pecl-event-3.0.2_p1
+++ b/metadata/md5-cache/dev-php/pecl-event-3.0.2_p1
@@ -5,11 +5,11 @@ DESCRIPTION=PHP wrapper for libevent2
 EAPI=7
 HOMEPAGE=https://pecl.php.net/event
 IUSE=debug examples +extra +sockets +ssl threads php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=PHP-3.01
 RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( dev-libs/openssl:0= ) php_targets_php7-3? ( dev-lang/php:7.3[sockets(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[sockets(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] ) !dev-php/pecl-libevent php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/event-3.0.2r1.tgz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	php-ext-pecl-r3	eb7289d77500ca992d6695fd2bd846ce	php-ext-source-r3	ed01672077ad33bb8c65eef8c91ab51d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=28133d4333d1f4a3502b1238dc749d3b
+_md5_=7d8588a032c6e22a4999f36c9eb50a18
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index abc14189b30e..3e112ee06f34 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/astroid-2.7.3-r1 b/metadata/md5-cache/dev-python/astroid-2.7.3-r1
index 58545efd022e..bba948967fd6 100644
--- a/metadata/md5-cache/dev-python/astroid-2.7.3-r1
+++ b/metadata/md5-cache/dev-python/astroid-2.7.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=8
 HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/astroid/archive/v2.7.3.tar.gz -> astroid-2.7.3.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=06ef0d099144059526699cae24fd2fc3
+_md5_=f91f226819f2f90525b4313a2c335b17
diff --git a/metadata/md5-cache/dev-python/astroid-2.9.0 b/metadata/md5-cache/dev-python/astroid-2.9.0
index bad4bacfb018..4db4b06fd7b2 100644
--- a/metadata/md5-cache/dev-python/astroid-2.9.0
+++ b/metadata/md5-cache/dev-python/astroid-2.9.0
@@ -4,7 +4,7 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
 EAPI=8
 HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/wrapt-1.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 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/PyCQA/astroid/archive/v2.9.0.tar.gz -> astroid-2.9.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=47c1d9123708ed4347d0c4996a406957
+_md5_=46e8ebdefee9e8a165d4edcf1e445ec3
diff --git a/metadata/md5-cache/dev-python/black-21.12_beta0 b/metadata/md5-cache/dev-python/black-21.12_beta0
new file mode 100644
index 000000000000..770634ab2ed8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/black-21.12_beta0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/aiohttp-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=The uncompromising Python code formatter
+EAPI=8
+HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/pathspec-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/tomli-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/psf/black/archive/21.12b0.tar.gz -> black-21.12b0.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=853c371cde0d66dfe31b926c7cf4f091
diff --git a/metadata/md5-cache/dev-python/boto3-1.20.21 b/metadata/md5-cache/dev-python/boto3-1.20.21
new file mode 100644
index 000000000000..96d8533660d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.20.21
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.23.21[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-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.23.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.20.21.tar.gz -> boto3-1.20.21.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c51591a1300e14982c151e391ee35158
diff --git a/metadata/md5-cache/dev-python/botocore-1.23.21 b/metadata/md5-cache/dev-python/botocore-1.23.21
new file mode 100644
index 000000000000..42f99884cbe5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.23.21
@@ -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 dev-python/sphinx[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jmespath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.23.21.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=948d42e7805832307320b7db1a293332
diff --git a/metadata/md5-cache/dev-python/cattrs-1.9.0 b/metadata/md5-cache/dev-python/cattrs-1.9.0
new file mode 100644
index 000000000000..5089485f69de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cattrs-1.9.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/immutables[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/attrs-20.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Composable complex class support for attrs and dataclasses.
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cattrs/ https://github.com/python-attrs/cattrs/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-20.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-attrs/cattrs/archive/v1.9.0.tar.gz -> cattrs-1.9.0.gh.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e4674cc5043c914cd95309fc099f7c7b
diff --git a/metadata/md5-cache/dev-python/django-2.2.25 b/metadata/md5-cache/dev-python/django-2.2.25
new file mode 100644
index 000000000000..cd519d6b7ea7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.2.25
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext ) verify-sig? ( app-crypt/openpgp-keys-django ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/2.2/Django-2.2.25.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-2.2.25.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=0a98b13b5c3602e9c60b316f343705db
diff --git a/metadata/md5-cache/dev-python/django-3.1.14 b/metadata/md5-cache/dev-python/django-3.1.14
new file mode 100644
index 000000000000..b010615d0f4b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.1.14
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.1/Django-3.1.14.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.1.14.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=fa17bb9e9cd792a56f5e3f8e812be25d
diff --git a/metadata/md5-cache/dev-python/django-3.2.10 b/metadata/md5-cache/dev-python/django-3.2.10
new file mode 100644
index 000000000000..52c7157a0f7d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.2.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite] ) >=dev-python/asgiref-3.3.4[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/sqlparse-0.2.2[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/jinja[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/pillow[webp,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/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 ) doc? ( dev-python/sphinx ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.3.4[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/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.10.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.10.checksum.txt )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	verify-sig	c777c0c815c60c9460f1ded02a8edb0a
+_md5_=76acda9683d22dbd877f3a4f56c5d46a
diff --git a/metadata/md5-cache/dev-python/imageio-2.13.2 b/metadata/md5-cache/dev-python/imageio-2.13.2
new file mode 100644
index 000000000000..b6cfa009e9b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-2.13.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library for reading and writing image data
+EAPI=8
+HOMEPAGE=https://imageio.github.io/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/imageio/imageio/archive/v2.13.2.tar.gz -> imageio-2.13.2.gh.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=95f2d0b1df42e6625ec2131acaf285ac
diff --git a/metadata/md5-cache/dev-python/isort-5.10.1 b/metadata/md5-cache/dev-python/isort-5.10.1
index 87cd85412618..b26199294557 100644
--- a/metadata/md5-cache/dev-python/isort-5.10.1
+++ b/metadata/md5-cache/dev-python/isort-5.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=A python utility/library to sort imports
 EAPI=8
 HOMEPAGE=https://pypi.org/project/isort/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/isort/archive/5.10.1.tar.gz -> isort-5.10.1.gh.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c3c4210cd4ad98fec283e9296f8ecfdb
+_md5_=4d136f3c3bd46ec7d1d4298c0509c05e
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2 b/metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2
new file mode 100644
index 000000000000..8664eae41273
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) doc? ( dev-vcs/git ) test? ( dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mkdocs plugin to display git authors of a page
+EAPI=8
+HOMEPAGE=https://github.com/timvink/mkdocs-git-authors-plugin/ https://pypi.org/project/mkdocs-git-authors-plugin/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/timvink/mkdocs-git-authors-plugin/archive/refs/tags/v0.6.2.tar.gz -> mkdocs-git-authors-plugin-0.6.2.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=7321abea06f447819521e1e448839a15
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.11 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.11
new file mode 100644
index 000000000000..2578a36726fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) doc? ( dev-vcs/git ) test? ( >=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-git-authors-plugin[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-git-authors-plugin[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/mkdocs-git-authors-plugin[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Display the localized date of the last git modification of a markdown file
+EAPI=8
+HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v0.11.tar.gz -> mkdocs-git-revision-date-localized-plugin-0.11.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1786953f63cc774ba99d64efb2b3f640
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.0.5 b/metadata/md5-cache/dev-python/mkdocs-material-8.0.5
new file mode 100644
index 000000000000..7856432ae445
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-8.0.5
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( dev-lang/python:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pymdown-extensions-9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.0.5.tar.gz -> mkdocs-material-8.0.5.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d5f4b27e4a9bd77db7ca50510bc8689c
diff --git a/metadata/md5-cache/dev-python/mypy-0.910-r1 b/metadata/md5-cache/dev-python/mypy-0.910-r1
index bd98d62523b7..2e0991f36353 100644
--- a/metadata/md5-cache/dev-python/mypy-0.910-r1
+++ b/metadata/md5-cache/dev-python/mypy-0.910-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=!dev-util/stubgen >=dev-python/psutil-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typed-ast-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/typed-ast-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mypy_extensions-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.910.tar.gz -> mypy-0.910.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5fc2aa9dac1cae5fc2d9af866853fa05
+_md5_=08e84300ef384e4689084c5eb8f9cdda
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index a0141ef2c04e..3e5007d818b8 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Optional static typing for Python
 EAPI=8
 HOMEPAGE=http://www.mypy-lang.org/ https://github.com/python/mypy_extensions/
 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 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c13b6fd794aa204418e61b153b28830f
+_md5_=c729d443b96ce5f4a7d861981d20edb7
diff --git a/metadata/md5-cache/dev-python/natsort-7.2.0 b/metadata/md5-cache/dev-python/natsort-7.2.0
index d1c6a74558a5..f686754f02e3 100644
--- a/metadata/md5-cache/dev-python/natsort-7.2.0
+++ b/metadata/md5-cache/dev-python/natsort-7.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Natural sorting for Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/natsort/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-7.2.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=17e2ec25f2c07cf874010951749c464b
+_md5_=2d4428b96a6e69acd87132842e059055
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.18.1 b/metadata/md5-cache/dev-python/nuitka-0.6.18.1
new file mode 100644
index 000000000000..c7cba0ca7b0e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.18.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nuitka.net/releases/Nuitka-0.6.18.1.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=18fa75cb088b8f76685e78133475cf84
diff --git a/metadata/md5-cache/dev-python/pillow-8.4.0 b/metadata/md5-cache/dev-python/pillow-8.4.0
index 5477abcfa88a..3eced368f9f4 100644
--- a/metadata/md5-cache/dev-python/pillow-8.4.0
+++ b/metadata/md5-cache/dev-python/pillow-8.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=8
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/8.4.0.tar.gz -> pillow-8.4.0.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=e5f9827e90a27b93586e2fd51ed3b519
+_md5_=f5a4117da3aba3e227cf8130e2f10c63
diff --git a/metadata/md5-cache/dev-python/pip-21.3.1-r1 b/metadata/md5-cache/dev-python/pip-21.3.1-r1
index 60bd3466f934..486217a72c50 100644
--- a/metadata/md5-cache/dev-python/pip-21.3.1-r1
+++ b/metadata/md5-cache/dev-python/pip-21.3.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=8
 HOMEPAGE=https://pip.pypa.io/en/stable/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=test vanilla python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools-39.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:0=[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/21.3.1.tar.gz -> pip-21.3.1.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-57.4.0-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.11.tar.gz -> virtualenv-16.7.11.tar.gz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99c94fdda2d31f0410508eef1d274d2f
+_md5_=d29e6657fa069e9d8e6423e854d0b2dc
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.2.6 b/metadata/md5-cache/dev-python/pyalsa-1.2.6
new file mode 100644
index 000000000000..5f77d37ceeb3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyalsa-1.2.6
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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=media-libs/alsa-lib dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Python bindings for ALSA library
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/alsa-lib python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.2.6.tar.bz2
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=227cfc67ef62f369943efd1a793100d8
diff --git a/metadata/md5-cache/dev-python/pydocstyle-6.1.1 b/metadata/md5-cache/dev-python/pydocstyle-6.1.1
index d4ca179369a7..89e0d1158a40 100644
--- a/metadata/md5-cache/dev-python/pydocstyle-6.1.1
+++ b/metadata/md5-cache/dev-python/pydocstyle-6.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Python docstring style checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/pydocstyle/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/6.1.1.tar.gz -> pydocstyle-6.1.1.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9b1a0f5e7cb95373e0a62643b59be375
+_md5_=21a63c1f2806b500f34883b3a145c0d1
diff --git a/metadata/md5-cache/dev-python/pylama-8.3.3 b/metadata/md5-cache/dev-python/pylama-8.3.3
index 5109d17e4a31..d1ec636d95bf 100644
--- a/metadata/md5-cache/dev-python/pylama-8.3.3
+++ b/metadata/md5-cache/dev-python/pylama-8.3.3
@@ -4,7 +4,7 @@ DESCRIPTION=Code audit tool for python
 EAPI=8
 HOMEPAGE=https://github.com/klen/pylama
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~mips ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/mccabe-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydocstyle-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klen/pylama/archive/8.3.3.tar.gz -> pylama-8.3.3.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ae5323b3772d9b7ec6553d6a65814588
+_md5_=341c0bf90e40e02872ba5e7b7cf2e721
diff --git a/metadata/md5-cache/dev-python/pylint-2.12.2 b/metadata/md5-cache/dev-python/pylint-2.12.2
index ba636df457cc..095a5e8826b2 100644
--- a/metadata/md5-cache/dev-python/pylint-2.12.2
+++ b/metadata/md5-cache/dev-python/pylint-2.12.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python code static checker
 EAPI=8
 HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint/
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astroid-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toml-0.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.12.2.tar.gz -> pylint-2.12.2.gh.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=03a39b73d7a804f9977130fd285c55a8
+_md5_=720369461452ab1835adfd005571d9ba
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-3.0.3 b/metadata/md5-cache/dev-python/qdarkstyle-3.0.3
new file mode 100644
index 000000000000..b1efcc56c697
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qdarkstyle-3.0.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/QtPy-1.7[gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-python/qtsass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/watchdog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/QtPy-1.7[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=A dark style sheet for QtWidgets application
+EAPI=8
+HOMEPAGE=https://github.com/ColinDuquesnoy/QDarkStyleSheet
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/QtPy-1.7[gui,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/Q/QDarkStyle/QDarkStyle-3.0.3.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d43aa469455ce1cd2341958c8680c35b
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.13 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.13
deleted file mode 100644
index 071334c21205..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/exdown[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/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=8
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.13.tar.gz -> tikzplotlib-0.9.13.gh.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=9b2434aa0330655d85f6b194e3faa6c6
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.15 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.15
deleted file mode 100644
index f003a12136d8..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/exdown[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/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] dev-python/matplotlib[latex,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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=8
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-text/texlive[extra] dev-python/matplotlib[latex,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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.15.tar.gz -> tikzplotlib-0.9.15.gh.tar.gz
-_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=3e2d7b8e800fb9fdf7588246fee74479
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.16 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.16
new file mode 100644
index 000000000000..4724ac3b1c99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.16
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/exdown[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/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-text/texlive[extra] <dev-python/matplotlib-3.5[latex,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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/mock[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/mock[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/mock[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyproject2setuppy-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
+EAPI=8
+HOMEPAGE=https://github.com/nschloe/tikzplotlib
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/texlive[extra] <dev-python/matplotlib-3.5[latex,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/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.16.tar.gz -> tikzplotlib-0.9.16.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c
+_md5_=fa9583634d86f18a7d481e39d4be3877
diff --git a/metadata/md5-cache/dev-python/tomli-1.2.2-r1 b/metadata/md5-cache/dev-python/tomli-1.2.2-r1
index bbef275ff2ff..ff356140da32 100644
--- a/metadata/md5-cache/dev-python/tomli-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/tomli-1.2.2-r1
@@ -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 ~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:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hukkin/tomli/archive/1.2.2.tar.gz -> tomli-1.2.2.gh.tar.gz https://files.pythonhosted.org/packages/py3/t/tomli/tomli-1.2.2-py3-none-any.whl -> tomli-1.2.2-py3-none-any.whl.zip
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=1b6caac5bdd5c19c5c789082112e3e28
+_md5_=5fb4afe73fd74bb935925e8cdf5d3314
diff --git a/metadata/md5-cache/dev-python/tomli-w-1.0.0 b/metadata/md5-cache/dev-python/tomli-w-1.0.0
index 0fa0d62f4bf8..e52106ac1e10 100644
--- a/metadata/md5-cache/dev-python/tomli-w-1.0.0
+++ b/metadata/md5-cache/dev-python/tomli-w-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A lil' TOML writer
 EAPI=8
 HOMEPAGE=https://pypi.org/project/tomli-w/ https://github.com/hukkin/tomli-w/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hukkin/tomli-w/archive/1.0.0.tar.gz -> tomli-w-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e108c8bef827611563059e9a041e7eab
+_md5_=e9497fd55c23c3606277c8a37a8446b9
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.2.2 b/metadata/md5-cache/dev-python/websocket-client-1.2.2
new file mode 100644
index 000000000000..fd7c5ae66d42
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websocket-client-1.2.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSocket client for python with hybi13 support
+EAPI=8
+HOMEPAGE=https://github.com/websocket-client/websocket-client
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.2.2.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e52ca1aa4592388aff967fc516322cf0
diff --git a/metadata/md5-cache/dev-python/wrapt-1.13.2 b/metadata/md5-cache/dev-python/wrapt-1.13.2
index 1a53c21583a6..c2e7ac55ecf3 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.13.2
+++ b/metadata/md5-cache/dev-python/wrapt-1.13.2
@@ -4,7 +4,7 @@ DESCRIPTION=Module for decorators, wrappers and monkey patching
 EAPI=8
 HOMEPAGE=https://github.com/GrahamDumpleton/wrapt
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.13.2.tar.gz -> wrapt-1.13.2.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=aa6523517beed3d92ee788a798f128e0
+_md5_=21cb682186113c8399a383e8ca41a898
diff --git a/metadata/md5-cache/dev-python/yamlpath-3.6.4 b/metadata/md5-cache/dev-python/yamlpath-3.6.4
new file mode 100644
index 000000000000..b7d1d742f1cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yamlpath-3.6.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-ruby/hiera-eyaml ) test? ( dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command-line processors for YAML/JSON/Compatible data.
+EAPI=8
+HOMEPAGE=https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wwkimball/yamlpath/archive/v3.6.4.tar.gz -> yamlpath-3.6.4.gh.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=b91fe76ef0d7d00d2e8bec9915ddf739
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 991c6e70f6aa..3e7a95f3f2a7 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/arel-helpers-2.13.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
new file mode 100644
index 000000000000..db264883e067
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( || ( dev-ruby/activerecord:6.1[ruby_targets_ruby26(-)] dev-ruby/activerecord:6.0[ruby_targets_ruby26(-)] dev-ruby/activerecord:5.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/activerecord:6.1[ruby_targets_ruby27(-)] dev-ruby/activerecord:6.0[ruby_targets_ruby27(-)] dev-ruby/activerecord:5.2[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rr[ruby_targets_ruby26(-)] dev-ruby/activerecord[ruby_targets_ruby26(-),sqlite] dev-ruby/bundler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rr[ruby_targets_ruby27(-)] dev-ruby/activerecord[ruby_targets_ruby27(-),sqlite] dev-ruby/bundler[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=Tools to help construct database queries
+EAPI=8
+HOMEPAGE=https://github.com/camertron/arel-helpers
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( || ( dev-ruby/activerecord:6.1[ruby_targets_ruby26(-)] dev-ruby/activerecord:6.0[ruby_targets_ruby26(-)] dev-ruby/activerecord:5.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( dev-ruby/activerecord:6.1[ruby_targets_ruby27(-)] dev-ruby/activerecord:6.0[ruby_targets_ruby27(-)] dev-ruby/activerecord:5.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 ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/arel-helpers-2.13.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6c6503f749a420d717eda6ba11010dad
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.19 b/metadata/md5-cache/dev-ruby/facter-3.14.19
deleted file mode 100644
index 95041337451f..000000000000
--- a/metadata/md5-cache/dev-ruby/facter-3.14.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec:2[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) dev-util/ninja >=dev-util/cmake-3.20.5 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-DESCRIPTION=A cross-platform ruby library for retrieving facts from operating systems
-EAPI=7
-HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.19.tar.gz -> facter-3.14.19.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=dea72c42ef0ec27061e8566cd6e6545a
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
deleted file mode 100644
index f4dd694dbdce..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( 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(-)] ) )
-DESCRIPTION=See which property values are supported by the regular expression engine
-EAPI=6
-HOMEPAGE=https://github.com/janosch-x/regexp_property_values
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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=1
-SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.0.0.tar.gz -> regexp_property_values-1.0.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=18238f7072934657ae922f0a0fd7faef
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0-r1 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0-r1
index 37f18b0b12ae..b158d84da581 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=See which property values are supported by the regular expression en
 EAPI=8
 HOMEPAGE=https://github.com/janosch-x/regexp_property_values
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.0.0.tar.gz -> regexp_property_values-1.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2f8360f4cad42ffcff4e05bbac7a9803
+_md5_=515a52c2568c0fa5c5574b557782c2c8
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-1.1.0 b/metadata/md5-cache/dev-ruby/regexp_property_values-1.1.0
new file mode 100644
index 000000000000..decc371d6f3a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-1.1.0
@@ -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=See which property values are supported by the regular expression engine
+EAPI=8
+HOMEPAGE=https://github.com/janosch-x/regexp_property_values
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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=1
+SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v1.1.0.tar.gz -> regexp_property_values-1.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=baf5866aad2b7e2e8fb056d509d009e8
diff --git a/metadata/md5-cache/dev-ruby/rr-3.0.9 b/metadata/md5-cache/dev-ruby/rr-3.0.9
new file mode 100644
index 000000000000..b59e7e5e3181
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rr-3.0.9
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/diff-lcs[ruby_targets_ruby26(-)] dev-ruby/test-unit-rr[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/diff-lcs[ruby_targets_ruby27(-)] dev-ruby/test-unit-rr[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/diff-lcs[ruby_targets_ruby30(-)] dev-ruby/test-unit-rr[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=A double framework featuring a selection of double techniques and a terse syntax
+EAPI=8
+HOMEPAGE=https://rr.github.io/rr
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~alpha ~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=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rr/rr/archive/v3.0.9.tar.gz -> rr-3.0.9.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c387bad1a1f4e9cd4ec6a4d792bab0fa
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
deleted file mode 100644
index 0c47a6742fc8..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/racc[ruby_targets_ruby27(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=7
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[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=3
-SRC_URI=https://rubygems.org/gems/ruby_parser-3.15.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=99fb589d11b4bf35a4ed36207cdee426
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
deleted file mode 100644
index 29a1421d252f..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/racc[ruby_targets_ruby27(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/racc[ruby_targets_ruby30(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby30(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=7
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.9.0:4[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 ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/ruby_parser-3.15.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4e42b28d62dc040b7dc0cdd7a979bea1
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0 b/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
deleted file mode 100644
index 317041e7a0a4..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/racc[ruby_targets_ruby27(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/racc[ruby_targets_ruby30(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby30(-)] >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=7
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.15.1:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.15.1:4[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 ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/ruby_parser-3.16.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=14a4887a2c2427d92613befad7ffcf01
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
index bfb600ebc0ca..0219777b399b 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
@@ -5,7 +5,7 @@ DESCRIPTION=A ruby parser written in pure ruby
 EAPI=8
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.16.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.16.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/sexp_processor-4.16.0:4[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.18.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=3a2b67e2fa1a5ae3c79ca8dd10b0c4ca
+_md5_=7f0c08561542bc5d5c1c8a5fb16b936b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
deleted file mode 100644
index 1c9008a855c9..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=7
-HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-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 ) !test? ( test )
-SLOT=4
-SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=25cc9c2c814c18f5d1919d46c27fa69b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
deleted file mode 100644
index 1bff0c33be36..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.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? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
-EAPI=7
-HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-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=4
-SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=dc380fd0d09c32737cdc16745de6df03
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
index 43d44038841d..64267ecae282 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
@@ -5,7 +5,7 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=8
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.16.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	ruby-fakegem	53b774322e7124b47b10a03fa0e089eb	ruby-ng	05a317c9b860e5661cc9baf18c442e1c	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0c7b79d886a0a2f5bdf2b7723f417973
+_md5_=8c8d643c615d488e05ca5a33654bd133
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 5c9b77d6adfd..6a6deed83c6d 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/latex2html-2021.2-r2 b/metadata/md5-cache/dev-tex/latex2html-2021.2-r2
index a0c22c7c8ef2..b38c1205cdf9 100644
--- a/metadata/md5-cache/dev-tex/latex2html-2021.2-r2
+++ b/metadata/md5-cache/dev-tex/latex2html-2021.2-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Convertor written in Perl that converts LaTeX documents to HTML
 EAPI=7
 HOMEPAGE=https://www.latex2html.org/
 IUSE=gif png
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl virtual/latex-base >=media-libs/netpbm-10.86.24 dev-lang/perl gif? ( media-libs/giflib ) png? ( media-libs/libpng:0 )
 SLOT=0
 SRC_URI=https://github.com/latex2html/latex2html/archive/v2021.2.tar.gz -> latex2html-2021.2.tar.gz
-_md5_=e36f6d891b6dc0203e78c487d9f2ca66
+_md5_=b0e1d0dfd0ed9d43d9d860504e0db656
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0bbe8b0b7699..89bdef0961ef 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/codeblocks-20.03-r4 b/metadata/md5-cache/dev-util/codeblocks-20.03-r4
index 1df770841398..0e175c753f8c 100644
--- a/metadata/md5-cache/dev-util/codeblocks-20.03-r4
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r4
@@ -5,10 +5,10 @@ DESCRIPTION=The open source, cross platform, free C, C++ and Fortran IDE
 EAPI=7
 HOMEPAGE=https://codeblocks.org/
 IUSE=contrib debug fortran pch
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/codeblocks/codeblocks-20.03.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.7.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.8.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-codecompletion-symbolbrowser-update.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5f75f11bfbdb751d60af5b6fd006e5de
+_md5_=ffa7f99a988090dd61a20c0e396a109b
diff --git a/metadata/md5-cache/dev-util/cppunit-1.15.1-r3 b/metadata/md5-cache/dev-util/cppunit-1.15.1-r3
index 814b4f89a416..036d4898f3ed 100644
--- a/metadata/md5-cache/dev-util/cppunit-1.15.1-r3
+++ b/metadata/md5-cache/dev-util/cppunit-1.15.1-r3
@@ -4,9 +4,9 @@ DESCRIPTION=C++ port of the famous JUnit framework for unit testing
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
 IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=LGPL-2.1
 SLOT=0/1.15
 SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=065ec586f1efc39e1904e80dc58ece72
+_md5_=df444315836a965de51497a3b05e7a41
diff --git a/metadata/md5-cache/dev-util/diffoscope-195 b/metadata/md5-cache/dev-util/diffoscope-195
new file mode 100644
index 000000000000..45a2b71034b1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-195
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-195.tar.gz
+_eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d4a8f387f3cb067bb10f011106b3ea18
diff --git a/metadata/md5-cache/dev-util/git-delta-0.11.1 b/metadata/md5-cache/dev-util/git-delta-0.11.1
new file mode 100644
index 000000000000..02144a1cb038
--- /dev/null
+++ b/metadata/md5-cache/dev-util/git-delta-0.11.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=dev-libs/libgit2:= dev-libs/oniguruma:=
+DESCRIPTION=A syntax-highlighting pager for git
+EAPI=8
+HOMEPAGE=https://github.com/dandavison/delta
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB
+RDEPEND=dev-libs/libgit2:= dev-libs/oniguruma:= !app-text/delta
+SLOT=0
+SRC_URI=https://github.com/dandavison/delta/archive/0.11.1.tar.gz -> git-delta-0.11.1.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_colours/1.0.4/download -> ansi_colours-1.0.4.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/approx/0.5.0/download -> approx-0.5.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.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/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/box_drawing/0.1.2/download -> box_drawing-0.1.2.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/bytelines/2.2.2/download -> bytelines-2.2.2.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chrono-humanize/0.2.1/download -> chrono-humanize-0.2.1.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.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/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.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-next/2.0.0/download -> dirs-next-2.0.0.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/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/find-crate/0.6.3/download -> find-crate-0.6.3.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/git2/0.13.23/download -> git2-0.13.23.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/grep-cli/0.1.6/download -> grep-cli-0.1.6.crate https://crates.io/api/v1/crates/hashbrown/0.8.2/download -> hashbrown-0.8.2.crate https://crates.io/api/v1/crates/heck/0.3.2/download -> heck-0.3.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.5.2/download -> indexmap-1.5.2.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/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.103/download -> libc-0.2.103.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.24+1.3.0/download -> libgit2-sys-0.12.24+1.3.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/nix/0.23.0/download -> nix-0.23.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/palette/0.6.0/download -> palette-0.6.0.crate https://crates.io/api/v1/crates/palette_derive/0.6.0/download -> palette_derive-0.6.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.1/download -> phf_generator-0.9.1.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.0.1/download -> plist-1.0.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.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-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.4.6/download -> regex-1.4.6.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.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.70/download -> serde_json-1.0.70.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/siphasher/0.3.7/download -> siphasher-0.3.7.crate https://crates.io/api/v1/crates/smol_str/0.1.21/download -> smol_str-0.1.21.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.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.57/download -> syn-1.0.57.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/sysinfo/0.19.2/download -> sysinfo-0.19.2.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-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.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/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.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.4.0/download -> xdg-2.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.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	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=1d79f722a38718a15b4e023c36211f1b
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-0.17 b/metadata/md5-cache/dev-util/include-what-you-use-0.17
new file mode 100644
index 000000000000..20fab1d40cae
--- /dev/null
+++ b/metadata/md5-cache/dev-util/include-what-you-use-0.17
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/clang:13= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) !!sys-devel/llvm:0
+DESCRIPTION=Find unused include directives in C/C++ programs
+EAPI=7
+HOMEPAGE=https://include-what-you-use.org/
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/clang:13= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/0.17.tar.gz -> include-what-you-use-0.17.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=ef19e76530cdbdaeb5e5e8829face918
diff --git a/metadata/md5-cache/dev-util/maturin-0.12.3 b/metadata/md5-cache/dev-util/maturin-0.12.3
deleted file mode 100644
index cab771fefe02..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.10 dev-python/cffi[python_targets_python3_10(-)] dev-python/virtualenv[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/cffi[python_targets_python3_9(-)] dev-python/virtualenv[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/cffi[python_targets_python3_8(-)] dev-python/virtualenv[python_targets_python3_8(-)] ) ) ) >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install setup test unpack
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://github.com/pyo3/maturin
-IUSE=test debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl
-PROPERTIES=test_network
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.12.3.tar.gz -> maturin-0.12.3.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.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/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.50/download -> anyhow-1.0.50.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.63/download -> backtrace-0.3.63.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.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.8.0/download -> bumpalo-3.8.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/camino/1.0.5/download -> camino-1.0.5.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.1/download -> cargo_metadata-0.14.1.crate https://crates.io/api/v1/crates/cbindgen/0.20.0/download -> cbindgen-0.20.0.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/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.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.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc32fast/1.2.2/download -> crc32fast-1.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.9.0/download -> dialoguer-0.9.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.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/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.29/download -> encoding_rs-0.8.29.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.5.0/download -> fastrand-1.5.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.4/download -> fat-macho-0.4.4.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.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/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/futures/0.3.18/download -> futures-0.3.18.crate https://crates.io/api/v1/crates/futures-channel/0.3.18/download -> futures-channel-0.3.18.crate https://crates.io/api/v1/crates/futures-core/0.3.18/download -> futures-core-0.3.18.crate https://crates.io/api/v1/crates/futures-executor/0.3.18/download -> futures-executor-0.3.18.crate https://crates.io/api/v1/crates/futures-io/0.3.18/download -> futures-io-0.3.18.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.18/download -> futures-macro-0.3.18.crate https://crates.io/api/v1/crates/futures-sink/0.3.18/download -> futures-sink-0.3.18.crate https://crates.io/api/v1/crates/futures-task/0.3.18/download -> futures-task-0.3.18.crate https://crates.io/api/v1/crates/futures-util/0.3.18/download -> futures-util-0.3.18.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/goblin/0.4.3/download -> goblin-0.4.3.crate https://crates.io/api/v1/crates/h2/0.3.7/download -> h2-0.3.7.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/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.2.5/download -> http-0.2.5.crate https://crates.io/api/v1/crates/http-body/0.4.4/download -> http-body-0.4.4.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.1.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.15/download -> hyper-0.14.15.crate https://crates.io/api/v1/crates/hyper-rustls/0.22.1/download -> hyper-rustls-0.22.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.3/download -> indoc-1.0.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.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/keyring/0.10.4/download -> keyring-0.10.4.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.108/download -> libc-0.2.108.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mailparse/0.13.6/download -> mailparse-0.13.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/minijinja/0.8.2/download -> minijinja-0.8.2.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/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.27.1/download -> object-0.27.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/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/os_type/2.3.0/download -> os_type-2.3.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.22/download -> pkg-config-0.3.22.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.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.32/download -> proc-macro2-1.0.32.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.0/download -> python-pkginfo-0.5.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.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/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/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.6/download -> reqwest-0.11.6.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/ryu/1.0.6/download -> ryu-1.0.6.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/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/secret-service/2.0.1/download -> secret-service-2.0.1.crate https://crates.io/api/v1/crates/security-framework/2.4.2/download -> security-framework-2.4.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.4.2/download -> security-framework-sys-2.4.2.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.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.72/download -> serde_json-1.0.72.crate https://crates.io/api/v1/crates/serde_repr/0.1.7/download -> serde_repr-0.1.7.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha2/0.9.8/download -> sha2-0.9.8.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/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/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.82/download -> syn-1.0.82.crate https://crates.io/api/v1/crates/tar/0.4.37/download -> tar-0.4.37.crate https://crates.io/api/v1/crates/target-lexicon/0.12.2/download -> target-lexicon-0.12.2.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.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/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.14.0/download -> tokio-1.14.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.22.0/download -> tokio-rustls-0.22.0.crate https://crates.io/api/v1/crates/tokio-util/0.6.9/download -> tokio-util-0.6.9.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.29/download -> tracing-0.1.29.crate https://crates.io/api/v1/crates/tracing-core/0.1.21/download -> tracing-core-0.1.21.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.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-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/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.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/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.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-futures/0.4.28/download -> wasm-bindgen-futures-0.4.28.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/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki-roots/0.21.1/download -> webpki-roots-0.21.1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zbus/1.9.1/download -> zbus-1.9.1.crate https://crates.io/api/v1/crates/zbus_macros/1.9.1/download -> zbus_macros-1.9.1.crate https://crates.io/api/v1/crates/zeroize/1.4.3/download -> zeroize-1.4.3.crate https://crates.io/api/v1/crates/zip/0.5.13/download -> zip-0.5.13.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( 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/libc/0.2.107/download -> libc-0.2.107.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/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/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/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/syn/1.0.81/download -> syn-1.0.81.crate )
-_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=431f300dbfb434a2156081ee6442faf1
diff --git a/metadata/md5-cache/dev-util/maturin-0.12.4 b/metadata/md5-cache/dev-util/maturin-0.12.4
new file mode 100644
index 000000000000..876ff441cc8b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.12.4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/mdbook ) test? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boltons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://maturin.rs/
+IUSE=doc test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0 openssl doc? ( CC-BY-4.0 OFL-1.1 )
+RDEPEND=dev-python/toml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.12.4.tar.gz -> maturin-0.12.4.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.51/download -> anyhow-1.0.51.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.63/download -> backtrace-0.3.63.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.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.8.0/download -> bumpalo-3.8.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cache-padded/1.1.1/download -> cache-padded-1.1.1.crate https://crates.io/api/v1/crates/camino/1.0.5/download -> camino-1.0.5.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.1/download -> cargo_metadata-0.14.1.crate https://crates.io/api/v1/crates/cbindgen/0.20.0/download -> cbindgen-0.20.0.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/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.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.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.0/download -> crc32fast-1.3.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.9.0/download -> dialoguer-0.9.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.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/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.29/download -> encoding_rs-0.8.29.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.5.0/download -> fastrand-1.5.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.4/download -> fat-macho-0.4.4.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.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/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/futures/0.3.18/download -> futures-0.3.18.crate https://crates.io/api/v1/crates/futures-channel/0.3.18/download -> futures-channel-0.3.18.crate https://crates.io/api/v1/crates/futures-core/0.3.18/download -> futures-core-0.3.18.crate https://crates.io/api/v1/crates/futures-executor/0.3.18/download -> futures-executor-0.3.18.crate https://crates.io/api/v1/crates/futures-io/0.3.18/download -> futures-io-0.3.18.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.18/download -> futures-macro-0.3.18.crate https://crates.io/api/v1/crates/futures-sink/0.3.18/download -> futures-sink-0.3.18.crate https://crates.io/api/v1/crates/futures-task/0.3.18/download -> futures-task-0.3.18.crate https://crates.io/api/v1/crates/futures-util/0.3.18/download -> futures-util-0.3.18.crate https://crates.io/api/v1/crates/generic-array/0.14.4/download -> generic-array-0.14.4.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/goblin/0.4.3/download -> goblin-0.4.3.crate https://crates.io/api/v1/crates/h2/0.3.7/download -> h2-0.3.7.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/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/http/0.2.5/download -> http-0.2.5.crate https://crates.io/api/v1/crates/http-body/0.4.4/download -> http-body-0.4.4.crate https://crates.io/api/v1/crates/httparse/1.5.1/download -> httparse-1.5.1.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.15/download -> hyper-0.14.15.crate https://crates.io/api/v1/crates/hyper-rustls/0.23.0/download -> hyper-rustls-0.23.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/1.0.3/download -> indoc-1.0.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.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/keyring/1.0.0/download -> keyring-1.0.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.109/download -> libc-0.2.109.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mailparse/0.13.7/download -> mailparse-0.13.7.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/minijinja/0.8.2/download -> minijinja-0.8.2.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/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.27.1/download -> object-0.27.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/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/os_type/2.3.0/download -> os_type-2.3.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.22/download -> pkg-config-0.3.22.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.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/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.0/download -> python-pkginfo-0.5.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.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/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/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.7/download -> reqwest-0.11.7.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/5.0.1/download -> rpassword-5.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustls/0.20.2/download -> rustls-0.20.2.crate https://crates.io/api/v1/crates/rustls-pemfile/0.2.1/download -> rustls-pemfile-0.2.1.crate https://crates.io/api/v1/crates/ryu/1.0.6/download -> ryu-1.0.6.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/scroll/0.10.2/download -> scroll-0.10.2.crate https://crates.io/api/v1/crates/scroll_derive/0.10.5/download -> scroll_derive-0.10.5.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.1/download -> secret-service-2.0.1.crate https://crates.io/api/v1/crates/security-framework/2.4.2/download -> security-framework-2.4.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.4.2/download -> security-framework-sys-2.4.2.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.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.72/download -> serde_json-1.0.72.crate https://crates.io/api/v1/crates/serde_repr/0.1.7/download -> serde_repr-0.1.7.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha2/0.9.8/download -> sha2-0.9.8.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.2/download -> socket2-0.4.2.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/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/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.82/download -> syn-1.0.82.crate https://crates.io/api/v1/crates/tar/0.4.37/download -> tar-0.4.37.crate https://crates.io/api/v1/crates/target-lexicon/0.12.2/download -> target-lexicon-0.12.2.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.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/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tokio/1.14.0/download -> tokio-1.14.0.crate https://crates.io/api/v1/crates/tokio-rustls/0.23.1/download -> tokio-rustls-0.23.1.crate https://crates.io/api/v1/crates/tokio-util/0.6.9/download -> tokio-util-0.6.9.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.29/download -> tracing-0.1.29.crate https://crates.io/api/v1/crates/tracing-core/0.1.21/download -> tracing-core-0.1.21.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.14.0/download -> typenum-1.14.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.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-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/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.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/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.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-futures/0.4.28/download -> wasm-bindgen-futures-0.4.28.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/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.21.1/download -> webpki-roots-0.21.1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zbus/1.9.1/download -> zbus-1.9.1.crate https://crates.io/api/v1/crates/zbus_macros/1.9.1/download -> zbus_macros-1.9.1.crate https://crates.io/api/v1/crates/zeroize/1.4.3/download -> zeroize-1.4.3.crate https://crates.io/api/v1/crates/zip/0.5.13/download -> zip-0.5.13.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( 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/libc/0.2.107/download -> libc-0.2.107.crate https://crates.io/api/v1/crates/libc/0.2.108/download -> libc-0.2.108.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/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/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/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.32/download -> proc-macro2-1.0.32.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/syn/1.0.81/download -> syn-1.0.81.crate )
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=977766b8604b916158d1c5c8b84bf17b
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1 b/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
index f35274a4b207..e000573746dc 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
+++ b/metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~kaniini/pkgconf
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=!dev-util/pkgconfig
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.8.0.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8b68ad20494bcf0c2de59cf76c14b9c9
+_md5_=a10787db12f5235b43500f64a6c7dd5b
diff --git a/metadata/md5-cache/dev-util/strace-5.14-r1 b/metadata/md5-cache/dev-util/strace-5.14-r1
index 44e26dce0f20..216e14e2dae4 100644
--- a/metadata/md5-cache/dev-util/strace-5.14-r1
+++ b/metadata/md5-cache/dev-util/strace-5.14-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=7
 HOMEPAGE=https://strace.io/
 IUSE=aio perl selinux static unwind elfutils
-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=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e75fd1e89e4050c686efd79a76693fdc
+_md5_=3b328bbae95ad239e41e62aeafc60474
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 782ed75dab1d..0db11c4a266a 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-2.34.0 b/metadata/md5-cache/dev-vcs/git-2.34.1-r1
similarity index 94%
rename from metadata/md5-cache/dev-vcs/git-2.34.0
rename to metadata/md5-cache/dev-vcs/git-2.34.1-r1
index c652f3010810..eed2a49d2bca 100644
--- a/metadata/md5-cache/dev-vcs/git-2.34.0
+++ b/metadata/md5-cache/dev-vcs/git-2.34.1-r1
@@ -11,6 +11,6 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.34.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.34.0.tar.xz )
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.34.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.34.1.tar.xz )
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed246c72f3b20a0214bdfe19395ed408
+_md5_=00ef68f0ea0371a3e018f93cea715f91
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 4e47491428c7..196dbf2ca9cc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed246c72f3b20a0214bdfe19395ed408
+_md5_=00ef68f0ea0371a3e018f93cea715f91
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 4e47491428c7..196dbf2ca9cc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed246c72f3b20a0214bdfe19395ed408
+_md5_=00ef68f0ea0371a3e018f93cea715f91
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 4e47491428c7..196dbf2ca9cc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed246c72f3b20a0214bdfe19395ed408
+_md5_=00ef68f0ea0371a3e018f93cea715f91
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 4e47491428c7..196dbf2ca9cc 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ed246c72f3b20a0214bdfe19395ed408
+_md5_=00ef68f0ea0371a3e018f93cea715f91
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.10.1 b/metadata/md5-cache/dev-vcs/git-cola-3.10.1
index 7452a8651e5f..e3b6807db21a 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.10.1
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.10.1
@@ -4,7 +4,7 @@ DESCRIPTION=The highly caffeinated git GUI
 EAPI=8
 HOMEPAGE=https://git-cola.github.io/
 IUSE=doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[network,python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] dev-python/send2trash[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[network,python_targets_python3_9(-)] dev-python/QtPy[gui,python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[network,python_targets_python3_10(-)] dev-python/QtPy[gui,python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] ) dev-vcs/git python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.10.1.tar.gz -> git-cola-3.10.1.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=4e92ee6449488bb87029f9584b2d57f1
+_md5_=f0de66bf91ff2cd7fbc5d32990f91ddd
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 35b8046d03a7..865b1bf73b73 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/gnuchess-6.2.9 b/metadata/md5-cache/games-board/gnuchess-6.2.9
index a4ea01b4670d..5c3ba4e3d982 100644
--- a/metadata/md5-cache/games-board/gnuchess-6.2.9
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=Console based chess interface
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/chess/chess.html
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-6.2.9.tar.gz
-_md5_=c62abb402b7a71414c3253a1233b288a
+_md5_=48e048a0703ce35b95a9b3aca26071fc
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 42582bf7c939..aed42173e3a3 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/openmw-0.46.0-r2 b/metadata/md5-cache/games-engines/openmw-0.46.0-r2
deleted file mode 100644
index fbf09bd6b6b2..000000000000
--- a/metadata/md5-cache/games-engines/openmw-0.46.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[-double-precision] virtual/opengl osg-fork? ( =dev-games/openscenegraph-openmw-3.4*:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Open source reimplementation of TES III: Morrowind
-EAPI=7
-HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
-IUSE=doc devtools +osg-fork test +qt5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 MIT BitstreamVera ZLIB
-RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads(+),zlib] dev-libs/tinyxml:=[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[-double-precision] virtual/opengl osg-fork? ( =dev-games/openscenegraph-openmw-3.4*:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.46.0.tar.gz https://gitlab.com/OpenMW/openmw/-/merge_requests/163.patch -> openmw-0.46.0-floattest.patch
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=89755b505da14b65ad52614b2ded728c
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 6bce74c2d29b..3e7f27dc64ca 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1 b/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
index 06e7e3b0524d..c63eedce80d6 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
+++ b/metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=The notorious fortune program
 EAPI=8
 HOMEPAGE=https://www.shlomifish.org/open-source/projects/fortune-mod/ http://www.redellipse.net/code/fortune
 IUSE=offensive
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=app-text/recode:= !games-misc/fortune-mod-tao
 SLOT=0
 SRC_URI=https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-3.6.1/fortune-mod-3.6.1.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=71df502c3501e57e01f65b079e82ec8a
+_md5_=5ea7c6de35aad33282aad58a19c4ea52
diff --git a/metadata/md5-cache/games-misc/fortune-mod-all-5 b/metadata/md5-cache/games-misc/fortune-mod-all-5
index 7ca84200b226..15ee4db121ab 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-all-5
+++ b/metadata/md5-cache/games-misc/fortune-mod-all-5
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package for all fortune-mod packages
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=l10n_cs l10n_de l10n_it
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~x86
 LICENSE=metapackage
 RDEPEND=>=games-misc/fortune-mod-3.6.1-r1 games-misc/fortune-mod-bofh-excuses games-misc/fortune-mod-chucknorris games-misc/fortune-mod-flashrider games-misc/fortune-mod-kernelcookies games-misc/fortune-mod-mormon games-misc/fortune-mod-osfortune games-misc/fortune-mod-scriptures games-misc/fortune-mod-taow games-misc/fortune-mod-zx-error l10n_cs? ( games-misc/fortune-mod-cs ) l10n_de? ( games-misc/fortune-mod-at-linux games-misc/fortune-mod-fvl games-misc/fortune-mod-norbert-tretkowski games-misc/fortune-mod-thomas-ogrisegg games-misc/fortune-mod-rss ) l10n_it? ( games-misc/fortune-mod-it )
 SLOT=0
-_md5_=003e907e06076724106402fb7d3e378f
+_md5_=55419d09544ea4daa752bae12028351a
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index bce256a4d4cf..234346f1af59 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3 b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
index e2fa79c3e761..0fe5a65bab58 100644
--- a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
+++ b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0
 SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz mirror://debian/pool/main/p/pathological/pathological_1.1.3-16.debian.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=332df5a2180ab22476088ef276758a22
+_md5_=3f983f582a74d2a13a164c52e68ac525
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index a5c7ee2926aa..554e5c2a6bf2 100644
Binary files a/metadata/md5-cache/gnustep-apps/Manifest.gz and b/metadata/md5-cache/gnustep-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4-r1 b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4-r1
new file mode 100644
index 000000000000..d4de06fa784e
--- /dev/null
+++ b/metadata/md5-cache/gnustep-apps/gworkspace-0.9.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=gnustep-base/gnustep-make-2.0
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.25.0 gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791 >=dev-db/sqlite-3.2.8 ) virtual/gnustep-back
+DESCRIPTION=A workspace manager for GNUstep
+EAPI=7
+HOMEPAGE=http://www.gnustep.org/experience/GWorkspace.html
+IUSE=+gwmetadata debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.25.0 gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791 >=dev-db/sqlite-3.2.8 ) virtual/gnustep-back
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.4.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnustep-2	e62084c6f8a47a695801af9119a20761	gnustep-base	9572b3101ddfc57358483561c0439981	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5656c49ee0be3f6167746a346329778a
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 9083cf8e5f50..1674ccaca826 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.10.1-r1 b/metadata/md5-cache/gui-libs/libwpe-1.10.1-r1
index c037b664cbe8..a4e4d56183d7 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.10.1-r1
+++ b/metadata/md5-cache/gui-libs/libwpe-1.10.1-r1
@@ -4,10 +4,10 @@ DEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
 DESCRIPTION=Platform-agnostic interfaces for WPE WebKit
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl(+)] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.10.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e3821b9bfcb67aabee9dea6077ce78b0
+_md5_=290070f36d498bf54bedb6b895339c21
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
index e4cd0614b4b4..8b87489f6e61 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
@@ -4,10 +4,10 @@ DEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-li
 DESCRIPTION=WPE backend designed for Linux desktop systems
 EAPI=7
 HOMEPAGE=https://wpewebkit.org/
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 RDEPEND=media-libs/libepoxy[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 >=gui-libs/libwpe-1.6:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.10.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4cfc0359331755568231f0216b059809
+_md5_=1e00ca39f959f41dd11bfaf5e52bf0f4
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 70cb584aaf00..98ecf7bdf082 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/kitinerary-21.08.3-r1 b/metadata/md5-cache/kde-apps/kitinerary-21.08.3-r1
index 2c3ab1fce85f..9c1c478ba993 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-21.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kitinerary-21.08.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Data Model and Extraction System for Travel Reservation information
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=+barcode pdf test debug test
-KEYWORDS=amd64 arm64
+KEYWORDS=amd64 arm64 ~ppc64
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libphonenumber dev-libs/libxml2:2 dev-libs/openssl:= >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-apps/kmime-21.08.3:5 >=kde-apps/kpkpass-21.08.3:5 >=kde-frameworks/karchive-5.84.0:5 >=kde-frameworks/kcalendarcore-5.84.0:5 >=kde-frameworks/kcontacts-5.84.0:5 >=kde-frameworks/ki18n-5.84.0:5 sys-libs/zlib barcode? ( >=media-libs/zxing-cpp-1.1.0 ) pdf? ( app-text/poppler:=[qt5] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=test? ( pdf )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/21.08.3/src/kitinerary-21.08.3.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	3efe514b4cd196a075e50ab6552a203d	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	kde.org	10ca734e4845124395fc126944c8d053	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=61aea3911c740e7e9e2caaa47b074c60
+_md5_=2cf745b54b00a9d9e50dd261bc874472
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 3b0a44b95d70..1b574c12db90 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.12.1 b/metadata/md5-cache/mail-filter/amavisd-new-2.12.1
index 78cbf8974dab..3ed376783e60 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.12.1
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.12.1
@@ -5,10 +5,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers
 EAPI=7
 HOMEPAGE=https://gitlab.com/amavis/amavis
 IUSE=clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2 BSD-2
 RDEPEND=acct-user/amavis app-arch/arc app-arch/bzip2 app-arch/cabextract app-arch/cpio app-arch/gzip app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/arj app-arch/unrar app-arch/xz-utils app-arch/zoo dev-lang/perl:* dev-perl/Archive-Zip dev-perl/BerkeleyDB dev-perl/Convert-BinHex dev-perl/File-LibMagic dev-perl/IO-Socket-SSL dev-perl/IO-stringy >=dev-perl/Mail-DKIM-0.31 >=dev-perl/MailTools-1.58 >=dev-perl/MIME-tools-5.415 dev-perl/Net-LibIDN >=dev-perl/Net-Server-0.91 dev-perl/Net-SSLeay dev-perl/Unix-Syslog net-mail/ripole net-mail/tnef >=sys-apps/coreutils-5.0-r3 >=sys-libs/db-4.4.20 virtual/mta virtual/perl-Compress-Raw-Zlib virtual/perl-Digest-MD5 virtual/perl-File-Temp virtual/perl-IO-Compress virtual/perl-IO-Socket-IP virtual/perl-MIME-Base64 virtual/perl-Time-HiRes clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) rspamd? ( dev-perl/HTTP-Message dev-perl/JSON dev-perl/LWP-UserAgent-Determined ) rspamd-https? ( dev-perl/HTTP-Message dev-perl/JSON dev-perl/LWP-UserAgent-Determined dev-perl/LWP-Protocol-https dev-perl/Net-SSLeay ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
 SLOT=0
 SRC_URI=https://gitlab.com/amavis/amavis/-/archive/v2.12.1/amavis-v2.12.1.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a97a5f9b699c494bfbc21ea2de2fb102
+_md5_=2e95faa070008007034ac396e1fa8dad
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1 b/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
index 9708c86f4a7f..5d75056fe7b0 100644
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for sp
 EAPI=7
 HOMEPAGE=http://bogofilter.sourceforge.net/
 IUSE=berkdb +sqlite tokyocabinet
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=app-arch/pax sci-libs/gsl:= virtual/libiconv berkdb? ( >=sys-libs/db-3.2:* ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2:* ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.5.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	db-use	063d3e7add942762a8203b52ec3066c2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e85ba7da3cc9084539d2a12870e77e56
+_md5_=c865b6f1710ef95f9aac9172a70c3160
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index bc1b43e93594..671c3b080ca5 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r3 b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r3
index 03677227f9b1..82457227182b 100644
--- a/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r3
+++ b/metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Japanese fixed fonts that cover JIS0213 charset
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=X X
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~ia64 ppc ~s390 ~sparc ~x86
 LICENSE=public-domain
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/jiskan16-2004-1.bdf.gz mirror://gentoo/jiskan16-2000-1.bdf.gz mirror://gentoo/jiskan16-2000-2.bdf.gz mirror://gentoo/K14-2004-1.bdf.gz mirror://gentoo/K14-2000-1.bdf.gz mirror://gentoo/K14-2000-2.bdf.gz mirror://gentoo/K12-1.bdf.gz mirror://gentoo/K12-2.bdf.gz mirror://gentoo/A14.bdf.gz mirror://gentoo/A12.bdf.gz mirror://gentoo/jiskan24-2000-1.bdf.gz mirror://gentoo/jiskan24-2000-2.bdf.gz
 _eclasses_=font	0667878c2b594871023dd1833d05996f	font-ebdftopcf	840fc70bac32a44ea27e63569c1ffea6
-_md5_=2e2ff30e08af4cde0a23f477121ec2d5
+_md5_=f88a74cc502dec290764090232eae23b
diff --git a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.004 b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.004
index 48959bca176b..96584b3e13e2 100644
--- a/metadata/md5-cache/media-fonts/kanjistrokeorders-4.004
+++ b/metadata/md5-cache/media-fonts/kanjistrokeorders-4.004
@@ -4,10 +4,10 @@ DESCRIPTION=Font for viewing stroke order diagrams for kanji, kana and other cha
 EAPI=7
 HOMEPAGE=https://www.nihilist.org.uk/
 IUSE=X
-KEYWORDS=amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=BSD
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://drive.google.com/uc?export=download&id=1snpD-IQmT6fGGQjEePHdDzE2aiwuKrz4 -> kanjistrokeorders-4.004.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=5249f0d56231db8b32b19b0f6ec4fba8
+_md5_=1c7024016517f7c7bb102cac966e8e19
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-4.000 b/metadata/md5-cache/media-fonts/sil-padauk-4.000
index 4c4428ad4d84..375f1dd6728f 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-4.000
+++ b/metadata/md5-cache/media-fonts/sil-padauk-4.000
@@ -4,9 +4,9 @@ DESCRIPTION=SIL fonts for Myanmar script
 EAPI=7
 HOMEPAGE=https://software.sil.org/padauk/
 IUSE=X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=https://software.sil.org/downloads/r/padauk/Padauk-4.000.zip
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=ea1f4958a937e8f968ba6fc5d42030f7
+_md5_=c1ffba044a3b476f5befb4944c08edbf
diff --git a/metadata/md5-cache/media-fonts/stix-fonts-2.11 b/metadata/md5-cache/media-fonts/stix-fonts-2.11
index 6191fe3c5bfd..4ee5903214b2 100644
--- a/metadata/md5-cache/media-fonts/stix-fonts-2.11
+++ b/metadata/md5-cache/media-fonts/stix-fonts-2.11
@@ -4,10 +4,10 @@ DESCRIPTION=Comprehensive OpenType font set of mathematical symbols and alphabet
 EAPI=7
 HOMEPAGE=https://www.stixfonts.org/
 IUSE=X
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/stipub/stixfonts/v2.11/zipfiles/static_otf.zip -> stix-fonts-2.11-otf.zip https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/FONTLOG.txt -> stix-fonts-2.11-FONTLOG.txt https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/STIXTwoMath-Regular.pdf -> stix-fonts-2.11-STIXTwoMath-Regular.pdf https://raw.githubusercontent.com/stipub/stixfonts/v2.11/docs/STIXTwoText-Regular.pdf -> stix-fonts-2.11-STIXTwoText-Regular.pdf
 _eclasses_=font	0667878c2b594871023dd1833d05996f
-_md5_=ed64d8e62d15eddd2ec67ebe1a4f5d40
+_md5_=d525739ecda1b3e2d8fc55d384da2247
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index abcddbcb84bb..12980626fa73 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/gifsicle-1.93 b/metadata/md5-cache/media-gfx/gifsicle-1.93
index 21dec7cdb0a9..27cfee7b2a50 100644
--- a/metadata/md5-cache/media-gfx/gifsicle-1.93
+++ b/metadata/md5-cache/media-gfx/gifsicle-1.93
@@ -4,9 +4,9 @@ DESCRIPTION=Create, manipulate, and optimize GIF images and animations
 EAPI=8
 HOMEPAGE=https://www.lcdf.org/~eddietwo/gifsicle/ https://github.com/kohler/gifsicle
 IUSE=X
-KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 MIT
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt )
 SLOT=0
 SRC_URI=https://www.lcdf.org/~eddietwo/gifsicle/gifsicle-1.93.tar.gz
-_md5_=3ac7ea117e64115f2128d9e65034a927
+_md5_=ef6a9ce039b0fa92176a41dce7630ba6
diff --git a/metadata/md5-cache/media-gfx/iscan-3.65.0 b/metadata/md5-cache/media-gfx/iscan-3.65.0
index 3e747dbd8280..bb60447d8b33 100644
--- a/metadata/md5-cache/media-gfx/iscan-3.65.0
+++ b/metadata/md5-cache/media-gfx/iscan-3.65.0
@@ -5,11 +5,11 @@ DESCRIPTION=EPSON Image Scan v3 for Linux
 EAPI=7
 HOMEPAGE=https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi
 IUSE=graphicsmagick gui test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/boost:= media-gfx/sane-backends media-libs/tiff virtual/jpeg virtual/libusb:1 graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) gui? ( dev-cpp/gtkmm:2.4 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_3.65.0.orig.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1e59e990efaf1691417202fc64c85bb3
+_md5_=12a481c6e2442bf21fca80d4e884ba85
diff --git a/metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11 b/metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
index 1c4e7d0bb08d..2834fe3f07ff 100644
--- a/metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
+++ b/metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Make BDF fonts bold and/or italic
 EAPI=8
 HOMEPAGE=https://hp.vector.co.jp/authors/VA013651/freeSoftware/mkbold-mkitalic.html
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~ia64 ppc ~s390 ~sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://hp.vector.co.jp/authors/VA013651/lib/mkbold-mkitalic-0.11.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=65979e1db7c4d4684195bfef221cb160
+_md5_=5621b389a5f7360cf2037fc60f770f75
diff --git a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1 b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
index 6b312e134da0..3ef429358ff9 100644
--- a/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
+++ b/metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib v
 DESCRIPTION=The Persistence of Vision Raytracer
 EAPI=6
 HOMEPAGE=https://www.povray.org/
-IUSE=debug +io-restrictions openexr static-libs tiff X test
+IUSE=debug +io-restrictions openexr tiff X test
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=AGPL-3
 RDEPEND=>=dev-libs/boost-1.50.0:=[threads(+)] media-libs/libpng:0 sys-libs/zlib virtual/jpeg:0 openexr? ( media-libs/ilmbase:= <media-libs/openexr-3.0.0:0= ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/POV-Ray/povray/archive/v3.7.0.0.tar.gz -> povray-3.7.0.0.tar.gz https://dev.gentoo.org/~soap/distfiles/povray-3.7.0.0_p20160914-fix-c++14.patch.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1acfc1c93fa9dfac50061d3b4c473b31
+_md5_=90da94880af2f83d0b42d75175bf4b81
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c53d89ea89f3..0e28cb41c94e 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.6 b/metadata/md5-cache/media-libs/alsa-lib-1.2.6
new file mode 100644
index 000000000000..078d63e7baa6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.6
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) ) media-libs/alsa-topology-conf media-libs/alsa-ucm-conf
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.6.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=284c5143598afed7d854a411e2dcf716
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6
new file mode 100644
index 000000000000..3343047061a3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=!<media-libs/alsa-lib-1.2.1
+DESCRIPTION=ALSA ucm configuration files
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=!<media-libs/alsa-lib-1.2.1
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.6.tar.bz2
+_md5_=1e6d5e17c04d7685155fddd73313711d
diff --git a/metadata/md5-cache/media-libs/hamlib-4.2 b/metadata/md5-cache/media-libs/hamlib-4.2
deleted file mode 100644
index 7a1760f75cd2..000000000000
--- a/metadata/md5-cache/media-libs/hamlib-4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen )
-DESCRIPTION=Ham radio backend rig control libraries
-EAPI=7
-HOMEPAGE=https://www.hamlib.org
-IUSE=doc perl python tcl python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=test
-SLOT=0/4.2
-SRC_URI=mirror://sourceforge/hamlib/hamlib-4.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6728bd3c383800771dff1e1b4cde20a
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.9.1 b/metadata/md5-cache/media-libs/harfbuzz-2.9.1
deleted file mode 100644
index 47ef9d13421a..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-2.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
-DESCRIPTION=An OpenType text shaping engine
-EAPI=8
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-RESTRICT=!test? ( test )
-SLOT=0/0.9.18
-SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.9.1.tar.gz -> harfbuzz-2.9.1.tar.gz
-_eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ef17d455d9234703e393b5fc55961f49
diff --git a/metadata/md5-cache/media-libs/lib3mf-2.2.0 b/metadata/md5-cache/media-libs/lib3mf-2.2.0
index 5eea2f73c6d5..7fccbfd2eda7 100644
--- a/metadata/md5-cache/media-libs/lib3mf-2.2.0
+++ b/metadata/md5-cache/media-libs/lib3mf-2.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of the 3D Manufacturing Format file standard
 EAPI=8
 HOMEPAGE=https://3mf.io/ https://github.com/3MFConsortium/lib3mf
 IUSE=+system-act test
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/libzip:= sys-apps/util-linux sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/3MFConsortium/lib3mf/archive/v2.2.0.tar.gz -> lib3mf-2.2.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c7d0c0833435cbe43720b72e7d174fcd
+_md5_=ece662269b5e92c2718e515a27cf71fc
diff --git a/metadata/md5-cache/media-libs/lsp-plugins-1.1.29 b/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
index 4fa133a66bc2..1044a326bf9a 100644
--- a/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
+++ b/metadata/md5-cache/media-libs/lsp-plugins-1.1.29
@@ -3,12 +3,13 @@ DEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-la
 DESCRIPTION=Linux Studio Plugins
 EAPI=7
 HOMEPAGE=https://lsp-plug.in
-IUSE=doc jack ladspa +lv2
+IUSE=doc jack ladspa +lv2 test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/expat media-libs/libsndfile media-libs/libglvnd[X] doc? ( dev-lang/php:* ) jack? ( virtual/jack x11-libs/cairo[X] ) ladspa? ( media-libs/ladspa-sdk ) lv2? ( media-libs/lv2 x11-libs/cairo[X] )
-REQUIRED_USE=|| ( jack ladspa lv2 )
+REQUIRED_USE=|| ( jack ladspa lv2 ) test? ( jack )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sadko4u/lsp-plugins/archive/1.1.29.tar.gz -> lsp-plugins-1.1.29.tar.gz
 _eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b9d9031fb28b078f63ef4e0ee70820ef
+_md5_=d4488a8f972297edd46d086743154fe8
diff --git a/metadata/md5-cache/media-libs/quvi-0.9.5 b/metadata/md5-cache/media-libs/quvi-0.9.5
deleted file mode 100644
index 4134a776be0f..000000000000
--- a/metadata/md5-cache/media-libs/quvi-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig 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 prepare
-DEPEND=dev-libs/glib:2 net-misc/curl:= media-libs/libquvi:= json? ( dev-libs/json-glib:= ) nls? ( virtual/libintl ) xml? ( dev-libs/libxml2:2= )
-DESCRIPTION=A command line tool for parsing video download links
-EAPI=7
-HOMEPAGE=http://quvi.sourceforge.net/
-IUSE=json nls xml
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/glib:2 net-misc/curl:= media-libs/libquvi:= json? ( dev-libs/json-glib:= ) nls? ( virtual/libintl ) xml? ( dev-libs/libxml2:2= )
-SLOT=0
-SRC_URI=mirror://sourceforge/quvi/0.9/quvi-0.9.5.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bb0e8fc2427f98792bc67507f71718f1
diff --git a/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122 b/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
index e97b8338d10f..3fe79cc64347 100644
--- a/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
+++ b/metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
@@ -4,9 +4,9 @@ DESCRIPTION=Recurrent neural network for audio noise reduction
 EAPI=7
 HOMEPAGE=https://jmvalin.ca/demo/rnnoise/ https://gitlab.xiph.org/xiph/rnnoise
 IUSE=doc
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://gitlab.xiph.org/xiph/rnnoise/-/archive/1cbdbcf1283499bbb2230a6b0f126eb9b236defd/rnnoise-1cbdbcf1283499bbb2230a6b0f126eb9b236defd.tar.gz -> rnnoise-0.4.1_p20210122.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a39fe6b7681243142e0aac0f8e67b2fd
+_md5_=755de10b00f1a35b914aa14cb188a22b
diff --git a/metadata/md5-cache/media-libs/rubberband-2.0.0 b/metadata/md5-cache/media-libs/rubberband-2.0.0
index 6b996d00bdd5..8e866011649f 100644
--- a/metadata/md5-cache/media-libs/rubberband-2.0.0
+++ b/metadata/md5-cache/media-libs/rubberband-2.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
 EAPI=8
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-2.0.0.tar.bz2
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=34ce80e34b708391c18ba7f6edd12435
+_md5_=1a1b463231bbc5bcf7d5fdb28507a25c
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 89b6bda68bfd..2d8d43fa5567 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.6 b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.6
new file mode 100644
index 000000000000..4ca78da0ea71
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.2.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[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=ALSA extra plugins
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+IUSE=arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/alsa-lib-1.2.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://www.alsa-project.org/files/pub/plugins/alsa-plugins-1.2.6.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=c98911da7dc6d68f685a6a3646623fcf
diff --git a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1 b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
index 09c116014365..cd12c3731fd0 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
+++ b/metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
@@ -4,10 +4,10 @@ DEPEND=media-video/vdr media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR Plugin: Osd-Teletext displays the teletext/videotext on the OSD
 EAPI=7
 HOMEPAGE=https://projects.vdr-developer.org/projects/plg-osdteletext https://github.com/vdr-projects/vdr-plugin-osdteletext/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ public-domain
 RDEPEND=media-video/vdr media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
 SLOT=0
 SRC_URI=https://github.com/vdr-projects/vdr-plugin-osdteletext/archive/v2.2.1.tar.gz -> vdr-osdteletext-2.2.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	user-info	2e75eaea3582b052ec16d9d5aa74ced3	vdr-plugin-2	7ef34c96d75b96130781b4ca3b561ec6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56b66889e74e156ffbbf482e9ad40f73
+_md5_=adcc33c4a19d94d18f164ab9f392ea93
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c492628ed642..d9525f43065c 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/abcmidi-2021.12.05 b/metadata/md5-cache/media-sound/abcmidi-2021.12.05
new file mode 100644
index 000000000000..effc6246b755
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2021.12.05
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=8
+HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2021.12.05.zip
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4f1f7243d91ded99640db6cf8ba8d7ce
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.6 b/metadata/md5-cache/media-sound/alsa-utils-1.2.6
new file mode 100644
index 000000000000..a648d206f57a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=media-libs/alsa-lib-1.2.6 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) doc? ( app-text/xmlto )
+DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
+EAPI=8
+HOMEPAGE=https://alsa-project.org/wiki/Main_Page
+IUSE=bat doc +libsamplerate +ncurses nls selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.2.6 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
+SLOT=0.9
+SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.6.tar.bz2
+_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=dfeb7350cd2d55d8198b4e1727868642
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.1.5 b/metadata/md5-cache/media-sound/easyeffects-6.1.5
index f17deae0b958..5841e6dccea5 100644
--- a/metadata/md5-cache/media-sound/easyeffects-6.1.5
+++ b/metadata/md5-cache/media-sound/easyeffects-6.1.5
@@ -5,11 +5,11 @@ DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire application
 EAPI=7
 HOMEPAGE=https://github.com/wwmm/easyeffects
 IUSE=calf +doc mda-lv2 zamaudio
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-cpp/glibmm-2.68:2.68 >=dev-cpp/gtkmm-4.2.0:4.0 dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-3.0.6:3 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.31 sci-libs/fftw:3.0 >=gui-libs/gtk-4.2.1:4 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.1.5.tar.gz -> easyeffects-6.1.5.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=55bb395234a81374d994ac92db28233a
+_md5_=1b9c773cd3b22d82b4e4ee56db02e230
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.1.0 b/metadata/md5-cache/media-sound/hydrogen-1.1.0
index 6ab1245d2d17..e3f6af3a74e9 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.1.0
+++ b/metadata/md5-cache/media-sound/hydrogen-1.1.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Advanced drum machine
 EAPI=7
 HOMEPAGE=http://www.hydrogen-music.org/
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2 ZLIB
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.1.0.tar.gz -> hydrogen-1.1.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=61ed7a58c47e3aea1cadc849748ab09e
+_md5_=25ebc0bb2cd1befeaeff2151e172f1de
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.1.1 b/metadata/md5-cache/media-sound/hydrogen-1.1.1
new file mode 100644
index 000000000000..38a6765e0f44
--- /dev/null
+++ b/metadata/md5-cache/media-sound/hydrogen-1.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5
+DESCRIPTION=Advanced drum machine
+EAPI=8
+HOMEPAGE=http://www.hydrogen-music.org/
+IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 ZLIB
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=lash? ( alsa )
+SLOT=0
+SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.1.1.tar.gz -> hydrogen-1.1.1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9713f7616da807b5a53ceda4c3d72e54
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index 7294a141034f..9171963f221f 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Advanced drum machine
 EAPI=7
 HOMEPAGE=http://www.hydrogen-music.org/
 IUSE=alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio
 LICENSE=GPL-2 ZLIB
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) doc? ( dev-texlive/texlive-fontutils ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d89bc12f918fcedaa4cacbb43e67545a
+_md5_=47ee01c602982541d06edf3cfaa2fc86
diff --git a/metadata/md5-cache/media-sound/pavucontrol-5.0-r1 b/metadata/md5-cache/media-sound/pavucontrol-5.0-r1
index de05a4f27bd7..afd53c09421a 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-5.0-r1
+++ b/metadata/md5-cache/media-sound/pavucontrol-5.0-r1
@@ -5,9 +5,9 @@ DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
 EAPI=7
 HOMEPAGE=https://freedesktop.org/software/pulseaudio/pavucontrol/
 IUSE=nls
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-15.0[glib] virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-5.0.tar.xz
-_md5_=7772a1f3d7e89f2aea48dcce0832ad7b
+_md5_=a21c26c7aed10a823516bc5424b2e0e1
diff --git a/metadata/md5-cache/media-sound/qsampler-0.9.4 b/metadata/md5-cache/media-sound/qsampler-0.9.4
index 2a0bcd80bf88..a62cfdd5d56b 100644
--- a/metadata/md5-cache/media-sound/qsampler-0.9.4
+++ b/metadata/md5-cache/media-sound/qsampler-0.9.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) media-sound/linuxsampler
 SLOT=0
 SRC_URI=mirror://sourceforge/qsampler/0.9.4/qsampler-0.9.4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e697da29869d018697028453046020d8
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=f43fa995bd19cd249de2912f3ef16d31
diff --git a/metadata/md5-cache/media-sound/qsampler-9999 b/metadata/md5-cache/media-sound/qsampler-9999
index 4f5dee1b472f..afc8d9a924b3 100644
--- a/metadata/md5-cache/media-sound/qsampler-9999
+++ b/metadata/md5-cache/media-sound/qsampler-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 libgig? ( media-libs/libgig:= ) media-sound/linuxsampler
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=61179ebc694e865f333b398f8b3a0aea
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=ed69ee0f453e13b5188f349942f6b93b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 0317447c0cc3..443115886d77 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/clive-2.3.0.1 b/metadata/md5-cache/media-video/clive-2.3.0.1
deleted file mode 100644
index 4f36f4698ecd..000000000000
--- a/metadata/md5-cache/media-video/clive-2.3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Test-Pod >=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Digest-SHA-5.47 >=dev-perl/HTML-TokeParser-Simple-2.37 >=dev-perl/Class-Singleton-1.4 >=dev-perl/WWW-Curl-4.05 >=dev-perl/XML-Simple-2.18 >=dev-perl/Getopt-ArgvFile-1.11 dev-perl/JSON-XS dev-perl/URI virtual/perl-Getopt-Long virtual/perl-File-Spec clipboard? ( >=dev-perl/Clipboard-0.09 ) pager? ( >=dev-perl/IO-Pager-0.05 ) password? ( >=dev-perl/Expect-1.21 ) media-libs/quvi || ( net-misc/wget net-misc/curl ) ) dev-lang/perl[-build(-)]
-DESCRIPTION=Command line tool for extracting videos from various websites
-EAPI=5
-HOMEPAGE=http://clive.sourceforge.net/
-IUSE=clipboard pager password test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Digest-SHA-5.47 >=dev-perl/HTML-TokeParser-Simple-2.37 >=dev-perl/Class-Singleton-1.4 >=dev-perl/WWW-Curl-4.05 >=dev-perl/XML-Simple-2.18 >=dev-perl/Getopt-ArgvFile-1.11 dev-perl/JSON-XS dev-perl/URI virtual/perl-Getopt-Long virtual/perl-File-Spec clipboard? ( >=dev-perl/Clipboard-0.09 ) pager? ( >=dev-perl/IO-Pager-0.05 ) password? ( >=dev-perl/Expect-1.21 ) media-libs/quvi || ( net-misc/wget net-misc/curl ) dev-lang/perl[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/clive/2.3/clive-2.3.0.1.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8aeee870341f23058d24e292645f078d
diff --git a/metadata/md5-cache/media-video/droidcam-1.8.0 b/metadata/md5-cache/media-video/droidcam-1.8.0
deleted file mode 100644
index 9bb0c0b14e58..000000000000
--- a/metadata/md5-cache/media-video/droidcam-1.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Use your phone or tablet as webcam with a v4l device driver and app
-EAPI=7
-HOMEPAGE=https://www.dev47apps.com/droidcam/linux/
-IUSE=gtk kernel_linux kernel_linux dist-kernel
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.0.tar.gz -> droidcam-1.8.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=f215efaa3953b91e0e4f07b50662cd1c
diff --git a/metadata/md5-cache/media-video/droidcam-1.8.0-r1 b/metadata/md5-cache/media-video/droidcam-1.8.1
similarity index 94%
rename from metadata/md5-cache/media-video/droidcam-1.8.0-r1
rename to metadata/md5-cache/media-video/droidcam-1.8.1
index b8130e165df4..8fd8d66f2a7a 100644
--- a/metadata/md5-cache/media-video/droidcam-1.8.0-r1
+++ b/metadata/md5-cache/media-video/droidcam-1.8.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=app-pda/libplist app-pda/libusbmuxd dev-libs/glib dev-libs/libappindicator:3 dev-libs/libxml2 dev-util/android-tools media-libs/alsa-lib media-libs/libjpeg-turbo >=media-libs/speex-1.2.0-r1 media-video/ffmpeg gtk? ( dev-cpp/gtkmm:3.0 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.0.tar.gz -> droidcam-1.8.0.tar.gz
+SRC_URI=https://github.com/dev47apps/droidcam/archive/v1.8.1.tar.gz -> droidcam-1.8.1.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=589b7e6548f30ec307a1224a13abc4f2
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index a12e99ad9abd..21effea91e8b 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1_p30 b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1_p30
new file mode 100644
index 000000000000..40c63cff971e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/dsniff-2.4_beta1_p30
@@ -0,0 +1,14 @@
+BDEPEND=net-libs/rpcsvc-proto sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-libs/rpcsvc-proto
+DESCRIPTION=A collection of tools for network auditing and penetration testing
+EAPI=7
+HOMEPAGE=https://monkey.org/~dugsong/dsniff/
+IUSE=X
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=net-libs/libpcap >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libnids-1.21 net-libs/libnsl:= net-libs/libtirpc:= dev-libs/openssl:= >=sys-libs/db-4:= X? ( x11-libs/libXmu )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian.orig.tar.gz mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian-30.debian.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=e26185fb66879354b56739359b756bca
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.7-r1 b/metadata/md5-cache/net-analyzer/wireshark-3.4.7-r1
deleted file mode 100644
index 481d289b83ce..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=7
-HOMEPAGE=https://www.wireshark.org/
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
-RESTRICT=test
-SLOT=0/3.4.7
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.7.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1859cc75d2f985b9a1b0b4c3de279953
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.8 b/metadata/md5-cache/net-analyzer/wireshark-3.4.8
deleted file mode 100644
index 1e9a6ea2479c..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) || ( dev-lang/python:3.9 dev-lang/python:3.8 )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=7
-HOMEPAGE=https://www.wireshark.org/
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
-RESTRICT=test
-SLOT=0/3.4.8
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.8.tar.xz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=7604cdbb6e3c7e18cbe4b845d6bfc93c
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1 b/metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1
index 46d0d803bf7a..b12ca61c3d28 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 )
+DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
 LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0/3.6.0
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.0.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5b50c589df106cf4c48b3f108bd415f7
+_md5_=02736dbac8d44193e0752d5a9bbbe6be
diff --git a/metadata/md5-cache/net-analyzer/wireshark-9999 b/metadata/md5-cache/net-analyzer/wireshark-9999
index e5f51593ac9c..35fe8e6d47f0 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-9999
+++ b/metadata/md5-cache/net-analyzer/wireshark-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 )
+DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=5b50c589df106cf4c48b3f108bd415f7
+_md5_=fc4bda699eaa1c5a337e2e66b2cf2b61
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 6dd5d63bac4f..83c6db545d08 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.9-r5 b/metadata/md5-cache/net-dialup/ppp-2.4.9-r5
index a0b97a2f0ed7..55187f22122e 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.9-r5
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.9-r5
@@ -5,11 +5,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
 EAPI=7
 HOMEPAGE=https://ppp.samba.org/
 IUSE=activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD GPL-2
 PDEPEND=net-dialup/ppp-scripts
 RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) !<net-misc/netifrc-0.7.1-r2
 SLOT=0/2.4.9
 SRC_URI=https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.9-patches-03.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7a8a928020f1f12d7493c1d8df1d10ac
+_md5_=42ee32084d10160a824db55feed714c0
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.15 b/metadata/md5-cache/net-dialup/rp-pppoe-3.15
index a926d744fbf5..90250dc4f3d5 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.15
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.15
@@ -5,10 +5,10 @@ DESCRIPTION=A user-mode PPPoE client and server suite for Linux
 EAPI=7
 HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
 IUSE=tk
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.15.tar.gz https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=0a9ab9dc498bb50f2614c2cf5d8d56dd
+_md5_=b20f8424adc880f5df17b7a4eda53f14
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fb663fc92ca9..5a6bc11ecffa 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.1.10 b/metadata/md5-cache/net-dns/opendnssec-2.1.10-r1
similarity index 65%
rename from metadata/md5-cache/net-dns/opendnssec-2.1.10
rename to metadata/md5-cache/net-dns/opendnssec-2.1.10-r1
index 28f3ad8d974c..87f4199475d0 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.1.10
+++ b/metadata/md5-cache/net-dns/opendnssec-2.1.10-r1
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( app-doc/doxygen ) test? ( app-text/trang dev-libs/softhsm:* dev-util/cunit ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=acct-group/opendnssec acct-user/opendnssec dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
+DEPEND=acct-group/opendnssec acct-user/opendnssec dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns[ed25519,ed448] mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 DESCRIPTION=An open-source turn-key solution for DNSSEC
 EAPI=7
 HOMEPAGE=https://www.opendnssec.org/
 IUSE=debug doc +mysql readline +signer sqlite test +softhsm opensc external-hsm
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2
-RDEPEND=acct-group/opendnssec acct-user/opendnssec dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
+RDEPEND=acct-group/opendnssec acct-user/opendnssec dev-lang/perl dev-libs/libxml2 dev-libs/libxslt net-libs/ldns[ed25519,ed448] mysql? ( dev-db/mysql-connector-c:0= dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) readline? ( sys-libs/readline:0 ) softhsm? ( dev-libs/softhsm:* ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.opendnssec.org/files/source/opendnssec-2.1.10.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=cfdcbf83ed57bcad7165990479a6e0f8
+_md5_=cf74d74912a97f102abe29c2542bb93f
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0a1e1e4807cf..b6d2ac16b5c6 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/ipset-7.15 b/metadata/md5-cache/net-firewall/ipset-7.15
index 021249ba18ee..f74c6604ec8d 100644
--- a/metadata/md5-cache/net-firewall/ipset-7.15
+++ b/metadata/md5-cache/net-firewall/ipset-7.15
@@ -5,10 +5,10 @@ DESCRIPTION=IPset tool for iptables, successor to ippool
 EAPI=7
 HOMEPAGE=https://ipset.netfilter.org/
 IUSE=kernel_linux kernel_linux kernel_linux dist-kernel modules
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl:= modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0
 SRC_URI=https://ipset.netfilter.org/ipset-7.15.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	linux-mod	1c03540c81548283580ab5526ab0978c	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=010925c533168526147c39b15ab5b3e6
+_md5_=fd251eec5abf386451d7cb839fc131de
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index bd00b7cd9eba..05764148cdc9 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/ejabberd-21.04-r1 b/metadata/md5-cache/net-im/ejabberd-21.04-r1
new file mode 100644
index 000000000000..8ecda6cc3ec7
--- /dev/null
+++ b/metadata/md5-cache/net-im/ejabberd-21.04-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/rebar >=sys-apps/gawk-4.1 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=>=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.28 >=dev-erlang/eimp-1.0.20 >=dev-erlang/fast_tls-1.1.12 >=dev-erlang/fast_xml-1.1.46 >=dev-erlang/fast_yaml-1.0.31 >=dev-erlang/yconf-1.0.11 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/jose-1.9.0 >=dev-erlang/lager-3.6.10 >=dev-erlang/p1_oauth2-0.6.9 >=dev-erlang/p1_utils-1.0.22 >=dev-erlang/stringprep-1.0.25 >=dev-erlang/xmpp-1.5.3 >=dev-erlang/pkix-1.0.7 >=dev-erlang/mqtree-1.0.13 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/p1_acme-1.0.12 >=dev-erlang/base64url-1.0.1 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.18 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.10 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.11 ) redis? ( >=dev-erlang/eredis-1.0.8 ) sip? ( >=dev-erlang/esip-1.0.42 ) sqlite? ( >=dev-erlang/sqlite3-1.1.12 ) stun? ( >=dev-erlang/stun-1.0.43 ) zlib? ( >=dev-erlang/ezlib-1.0.9 ) dev-lang/erlang:=
+DESCRIPTION=Robust, scalable and extensible XMPP server
+EAPI=7
+HOMEPAGE=https://www.ejabberd.im/ https://github.com/processone/ejabberd/
+IUSE=captcha debug full-xml ldap mssql mysql odbc pam postgres redis roster-gw selinux sip sqlite +stun zlib
+KEYWORDS=~amd64 ~arm ~ia64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.28 >=dev-erlang/eimp-1.0.20 >=dev-erlang/fast_tls-1.1.12 >=dev-erlang/fast_xml-1.1.46 >=dev-erlang/fast_yaml-1.0.31 >=dev-erlang/yconf-1.0.11 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/jose-1.9.0 >=dev-erlang/lager-3.6.10 >=dev-erlang/p1_oauth2-0.6.9 >=dev-erlang/p1_utils-1.0.22 >=dev-erlang/stringprep-1.0.25 >=dev-erlang/xmpp-1.5.3 >=dev-erlang/pkix-1.0.7 >=dev-erlang/mqtree-1.0.13 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/p1_acme-1.0.12 >=dev-erlang/base64url-1.0.1 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.18 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.10 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.11 ) redis? ( >=dev-erlang/eredis-1.0.8 ) sip? ( >=dev-erlang/esip-1.0.42 ) sqlite? ( >=dev-erlang/sqlite3-1.1.12 ) stun? ( >=dev-erlang/stun-1.0.43 ) zlib? ( >=dev-erlang/ezlib-1.0.9 ) acct-user/ejabberd captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) dev-lang/erlang:=
+REQUIRED_USE=mssql? ( odbc )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://static.process-one.net/ejabberd/downloads/21.04/ejabberd-21.04.tgz -> ejabberd-21.04.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	pam	41ce39f668e11d31ff4734f3b5794f7d	rebar	f13843e18f4ec00f45f7158bd3f3d3bb	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=4c31843f27485dbc2fb1c7a8ee5b5db4
diff --git a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.6.0 b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.0
similarity index 95%
rename from metadata/md5-cache/net-im/rocketchat-desktop-bin-3.6.0
rename to metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.0
index fbd55aba607e..f21e1abf7faa 100644
--- a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.6.0
+++ b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.0
@@ -7,6 +7,6 @@ KEYWORDS=-* ~amd64
 LICENSE=MIT
 RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify 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/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango
 SLOT=0
-SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.6.0/rocketchat-3.6.0.x86_64.rpm
+SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.7.0/rocketchat-3.7.0.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=61a75ef3eb848da78f229cfbd2771e45
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 04f0b8dd8cb5..426838d96a89 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/canlock-3.2.2 b/metadata/md5-cache/net-libs/canlock-3.2.2
index 8381a7ea822e..cadf51fbb5b9 100644
--- a/metadata/md5-cache/net-libs/canlock-3.2.2
+++ b/metadata/md5-cache/net-libs/canlock-3.2.2
@@ -4,9 +4,9 @@ DESCRIPTION=A library for creating and verifying Usenet cancel locks
 EAPI=8
 HOMEPAGE=https://micha.freeshell.org/libcanlock/
 IUSE=+legacy
-KEYWORDS=amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD MIT
 SLOT=0/3
 SRC_URI=https://micha.freeshell.org/libcanlock/src/libcanlock-3.2.2.tar.bz2
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=5565f1554ac3243accb0a883954c9206
+_md5_=4029a5322f47b3712cc2ef85fd81d28e
diff --git a/metadata/md5-cache/net-libs/czmq-4.2.1 b/metadata/md5-cache/net-libs/czmq-4.2.1
index 800db675d918..2ecd5502da01 100644
--- a/metadata/md5-cache/net-libs/czmq-4.2.1
+++ b/metadata/md5-cache/net-libs/czmq-4.2.1
@@ -5,9 +5,9 @@ DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=8
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=curl drafts http-client http-server lz4 nss static-libs systemd +uuid
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=amd64 arm arm64 ~hppa x86
 LICENSE=MPL-2.0
 RDEPEND=>=net-libs/zeromq-4:=[drafts?] http-client? ( net-misc/curl ) http-server? ( net-libs/libmicrohttpd:= ) lz4? ( app-arch/lz4:= ) nss? ( dev-libs/nspr dev-libs/nss ) systemd? ( sys-apps/systemd ) uuid? ( sys-apps/util-linux:0 )
 SLOT=0/4
 SRC_URI=https://github.com/zeromq/czmq/releases/download/v4.2.1/czmq-4.2.1.tar.gz
-_md5_=fe810dad1a9b2062d7e0bb91873dc8d9
+_md5_=c84d4d91a45f71b1ef2c18bd7cf6042f
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.17 b/metadata/md5-cache/net-libs/liblockfile-1.17
index 9981a8a71f7d..34ac2b46a09c 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.17
+++ b/metadata/md5-cache/net-libs/liblockfile-1.17
@@ -5,10 +5,10 @@ DESCRIPTION=Implements functions designed to lock the standard mailboxes
 EAPI=7
 HOMEPAGE=https://github.com/miquels/liblockfile
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=acct-group/mail
 SLOT=0
 SRC_URI=https://github.com/miquels/liblockfile/archive/v1.17.tar.gz -> liblockfile-1.17.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=b8166d5c81ab0e4b0b5af5f83764bd42
+_md5_=716803663d7b02c4f44085bd8a550dd2
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.32.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.32.4
index 7ad294a88f25..c877bdec3c44 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.32.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.32.4
@@ -5,7 +5,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=7
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X test
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-60.2:= virtual/jpeg:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 opengl? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
 REQUIRED_USE=gles2-only? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	fef543fb9014c61e207d8b3fb27b4793	gnome2-utils	355c758ccc0d6df60d43a066640e642c	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c1568b972548a7469fe4af75d054e709
+_md5_=fc7cc3ac76e9f9fa21cbdcfb1ef602de
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 1e87766ccbec..1ed7e4a34964 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/automx2-2021.5 b/metadata/md5-cache/net-mail/automx2-2021.5
index 7f746002efba..966570c55570 100644
--- a/metadata/md5-cache/net-mail/automx2-2021.5
+++ b/metadata/md5-cache/net-mail/automx2-2021.5
@@ -4,7 +4,7 @@ DESCRIPTION=Email client autoconfiguration service
 EAPI=7
 HOMEPAGE=https://automx.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-migrate[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask-sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rseichter/automx2/archive/2021.5.tar.gz -> automx2-2021.5.tar.gz
 _eclasses_=distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=9aa9312dd7ef5f829ff3aa6ebeec2f8a
+_md5_=6058a8eba4073f132119ca03613cc8e4
diff --git a/metadata/md5-cache/net-mail/isync-1.4.2 b/metadata/md5-cache/net-mail/isync-1.4.4
similarity index 75%
rename from metadata/md5-cache/net-mail/isync-1.4.2
rename to metadata/md5-cache/net-mail/isync-1.4.4
index 9eb763424f85..77682485848b 100644
--- a/metadata/md5-cache/net-mail/isync-1.4.2
+++ b/metadata/md5-cache/net-mail/isync-1.4.4
@@ -5,9 +5,9 @@ DESCRIPTION=MailDir mailbox synchronizer
 EAPI=7
 HOMEPAGE=http://isync.sourceforge.net/
 IUSE=berkdb sasl ssl zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=berkdb? ( >=sys-libs/db-4.2:= ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.6:0= ) zlib? ( sys-libs/zlib:0= )
 SLOT=0
-SRC_URI=mirror://sourceforge/isync/isync/1.4.2/isync-1.4.2.tar.gz
-_md5_=b2eb7b5b186b6456e99b1af49cddbb3b
+SRC_URI=mirror://sourceforge/isync/isync/1.4.4/isync-1.4.4.tar.gz
+_md5_=f3a8c4c8acb8031f2b8780651c2ddf39
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2f2f5fa1d3a5..17ae14783484 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/networkmanager-1.32.12 b/metadata/md5-cache/net-misc/networkmanager-1.32.12
index 91f219e34131..997d01e3755f 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.12
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.12
@@ -5,7 +5,7 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 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 kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+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 )
@@ -13,4 +13,4 @@ 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	6b67971d8a0a029d13181f2cfb9f5fa9	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	ba63120449f0238a2f0c39303871ad99	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d1992dece690d798471eeba00d11a867
+_md5_=ad0edfe9f32366bc7fa20152e50a7f5e
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.32.12-r1 b/metadata/md5-cache/net-misc/networkmanager-1.32.12-r1
index ab28ff8966a3..db2291b2a529 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.32.12-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.32.12-r1
@@ -5,6 +5,7 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 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 kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( sys-libs/readline:0= >=dev-libs/newt-0.52.15 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
@@ -12,4 +13,4 @@ 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	6b67971d8a0a029d13181f2cfb9f5fa9	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	readme.gentoo-r1	c9646d622541c023f5159b86a14e930c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	vala	ba63120449f0238a2f0c39303871ad99	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b5c98dafb9ff61adea776a8ca4ed61e7
+_md5_=4d183d44c7975381311063ee65f6716d
diff --git a/metadata/md5-cache/net-misc/socat-1.7.4.2 b/metadata/md5-cache/net-misc/socat-1.7.4.2
index 1562a57822ec..057d14b2f2e3 100644
--- a/metadata/md5-cache/net-misc/socat-1.7.4.2
+++ b/metadata/md5-cache/net-misc/socat-1.7.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=8
 HOMEPAGE=http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git
 IUSE=bindist ipv6 readline ssl tcpd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=test ssl? ( readline? ( bindist ) )
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.4.2.tar.gz
 _eclasses_=flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc251ceb2a38012d6e74b779b863dedf
+_md5_=0f8cde6f7f8e2ec9c9ff49a047c10c12
diff --git a/metadata/md5-cache/net-misc/tigervnc-9999 b/metadata/md5-cache/net-misc/tigervnc-9999
new file mode 100644
index 000000000000..b5712271ba6d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-9999
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcvt x11-libs/pixman server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-21.1* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) x11-base/xorg-proto media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXft x11-libs/libXi server? ( dev-libs/libbsd x11-libs/libxkbfile x11-libs/libxshmfence virtual/pkgconfig media-fonts/font-util x11-misc/util-macros >=x11-libs/xtrans-1.3.3 opengl? ( >=media-libs/mesa-10.3.4-r1 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Remote desktop viewer display system
+EAPI=7
+HOMEPAGE=http://www.tigervnc.org
+IUSE=dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcvt x11-libs/pixman server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-21.1* ) drm? ( x11-libs/libdrm ) dev-libs/openssl:0= ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc
+SLOT=0
+SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=5f076c021c5ddaebf7aeff5a80b240b6
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2021.12.1 b/metadata/md5-cache/net-misc/yt-dlp-2021.12.1-r1
similarity index 95%
rename from metadata/md5-cache/net-misc/yt-dlp-2021.12.1
rename to metadata/md5-cache/net-misc/yt-dlp-2021.12.1-r1
index 60735ee8c64d..5f57535d358b 100644
--- a/metadata/md5-cache/net-misc/yt-dlp-2021.12.1
+++ b/metadata/md5-cache/net-misc/yt-dlp-2021.12.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=youtube-dl fork with additional features and fixes
 EAPI=8
 HOMEPAGE=https://github.com/yt-dlp/yt-dlp
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=Unlicense
 RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !net-misc/youtube-dl python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2021.12.1.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bc8d98e32d419c8f8c04a406094715eb
+_md5_=88f4930a545cae2cb823b2eda2aed7a0
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 6aa30588b021..a9b4428e1e44 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/retroshare-0.6.6-r1 b/metadata/md5-cache/net-p2p/retroshare-0.6.6-r1
index 30c5f0a2419b..53fc7be94d84 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.6-r1
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=P2P private sharing application
 EAPI=7
 HOMEPAGE=https://retroshare.cc
 IUSE=autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3
 RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 sys-libs/zlib autologin? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) libupnp? ( net-libs/libupnp:= ) miniupnp? ( net-libs/miniupnpc:= ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( gui service ) ?? ( libupnp miniupnp ) service? ( || ( cli jsonapi ) )
 SLOT=0
 SRC_URI=http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_0.6.6.orig.tar.gz -> retroshare-0.6.6.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0025890d27204a23ba0e642deeffccf2
+_md5_=f066377c6bd9bcbb6994acdc117f1f70
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 42a6c0544e5b..5f5b12c596a3 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.8 b/metadata/md5-cache/net-proxy/haproxy-2.0.26
similarity index 65%
rename from metadata/md5-cache/net-proxy/haproxy-2.4.8
rename to metadata/md5-cache/net-proxy/haproxy-2.0.26
index 43ce1a18d703..8c19bf6f1e8a 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.8
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.26
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
 DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
 EAPI=7
 HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0/2.4
-SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.8.tar.gz
+SLOT=0/2.0
+SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.26.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
+_md5_=e412af4ec490882c7dc5a77bef38d2f2
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.7 b/metadata/md5-cache/net-proxy/haproxy-2.4.7
deleted file mode 100644
index 1e60b548df9d..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0/2.4
-SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e37ffa1bc2d6be91bb0dcebfb04326b
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 04bc8228a8f7..caa8f1ab7b75 100644
Binary files a/metadata/md5-cache/perl-core/Manifest.gz and b/metadata/md5-cache/perl-core/Manifest.gz differ
diff --git a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26 b/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
deleted file mode 100644
index 5684fd42952a..000000000000
--- a/metadata/md5-cache/perl-core/Module-Metadata-1.0.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Gather package and POD information from perl module files
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Module-Metadata
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-version-0.870 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000026.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e2dd8db4608d14537d80b958442a399f
diff --git a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0 b/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
deleted file mode 100644
index 7ab7b89696fb..000000000000
--- a/metadata/md5-cache/perl-core/Pod-Simple-3.280.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Framework for parsing Pod
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Pod-Simple
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Pod-Escapes-1.04 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.28.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b68581178dc25f95e8f7babc5b4385e2
diff --git a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1 b/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
deleted file mode 100644
index add0c6278e68..000000000000
--- a/metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Provides same functionality as BSD syslog
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Sys-Syslog
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.33.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e3d4194f75c364d6fbdd176f575fb625
diff --git a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0 b/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
deleted file mode 100644
index a770fc54e474..000000000000
--- a/metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Color screen output using ANSI escape sequences
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Term-ANSIColor
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.02.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b8eb6b4da22fd254f266b9abe6dcdd9
diff --git a/metadata/md5-cache/perl-core/parent-0.228-r1 b/metadata/md5-cache/perl-core/parent-0.228-r1
deleted file mode 100644
index 20aa4f2327d5..000000000000
--- a/metadata/md5-cache/perl-core/parent-0.228-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Establish an ISA relationship with base classes at compile time
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/parent
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CO/CORION/parent-0.228.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8de14c26dd105ad5343a1ab16bf7c673
diff --git a/metadata/md5-cache/perl-core/podlators-2.5.3 b/metadata/md5-cache/perl-core/podlators-2.5.3
deleted file mode 100644
index 6226fdab3839..000000000000
--- a/metadata/md5-cache/perl-core/podlators-2.5.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-lang/perl-5.8.8-r8 >=virtual/perl-Pod-Simple-3.06 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Format POD source into various output formats
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/podlators
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-lang/perl-5.8.8-r8 >=virtual/perl-Pod-Simple-3.06 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz
-_eclasses_=alternatives	b6cdc5b72d4fe90a64c72b9852e12f69	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7c668a0b06fdc02d1ea8ac54bbad0a3
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 9ad15b642282..8ca5057de647 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.8.6 b/metadata/md5-cache/sci-geosciences/grass-7.8.6
index e143c784ba5f..bf77483ba77f 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.8.6
+++ b/metadata/md5-cache/sci-geosciences/grass-7.8.6
@@ -5,11 +5,11 @@ DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizua
 EAPI=7
 HOMEPAGE=https://grass.osgeo.org/
 IUSE=blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=app-admin/eselect-1.2 python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack[eselect-ldso(+)] ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:4.0 x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) opengl? ( X )
 SLOT=0/7.8.0
 SRC_URI=https://grass.osgeo.org/grass78/source/grass-7.8.6.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	7e8a20d3bacea0e3ecf6e96fb72180aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=9b6d566943c2a62275f442d2e034f5ed
+_md5_=ae14873e8694c372528b182d98a80102
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
index ab80c88441ae..d826a5d8378d 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/quazip:0= dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative
 DESCRIPTION=GPS mapping utility
 EAPI=7
 HOMEPAGE=https://github.com/Maproom/qmapshack/wiki
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/quazip:0= dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qthelp:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] >=sci-geosciences/routino-3.1.1 sci-libs/alglib sci-libs/gdal:= >=sci-libs/proj-8:=
 SLOT=0
 SRC_URI=https://github.com/Maproom/qmapshack/archive/V_1.16.0.tar.gz -> qmapshack-1.16.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=635c3492d7971627c64a937c709676cb
+_md5_=65c6b4d3f3cc39e9c8966caa60adacdf
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 1b3ebf0f103e..54b7b0fb9fed 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/dealii-9.3.1-r1 b/metadata/md5-cache/sci-libs/dealii-9.3.1-r1
index 9e5716c5ef49..e9a66f2a55ed 100644
--- a/metadata/md5-cache/sci-libs/dealii-9.3.1-r1
+++ b/metadata/md5-cache/sci-libs/dealii-9.3.1-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= app-arch/bzip2 sys-libs/zlib dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
+DEPEND=dev-libs/boost:= !~dev-libs/boost-1.77.0 app-arch/bzip2 sys-libs/zlib dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine trilinos
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/boost:= app-arch/bzip2 sys-libs/zlib dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
+RDEPEND=dev-libs/boost:= !~dev-libs/boost-1.77.0 app-arch/bzip2 sys-libs/zlib dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
 REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/dealii/dealii/releases/download/v9.3.1/dealii-9.3.1.tar.gz doc? ( https://github.com/dealii/dealii/releases/download/v9.3.1/dealii-9.3.1-offline_documentation.tar.gz )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=47bca569ff5727fce1dc6d7ba54761e1
+_md5_=e210cc9a30c46632a93f4e2e2e591012
diff --git a/metadata/md5-cache/sci-libs/dealii-9999 b/metadata/md5-cache/sci-libs/dealii-9999
index 0086dac8318a..4fa7042bcafb 100644
--- a/metadata/md5-cache/sci-libs/dealii-9999
+++ b/metadata/md5-cache/sci-libs/dealii-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
+DEPEND=dev-libs/boost:= !~dev-libs/boost-1.77.0 app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl )
 DESCRIPTION=Solving partial differential equations with the finite element method
 EAPI=7
 HOMEPAGE=https://www.dealii.org/
 IUSE=adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse static-libs sundials symengine trilinos
 LICENSE=LGPL-2.1+
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
+RDEPEND=dev-libs/boost:= !~dev-libs/boost-1.77.0 app-arch/bzip2 sys-libs/zlib dev-cpp/cpp-taskflow dev-cpp/tbb:= adolc? ( sci-libs/adolc ) arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp ) cuda? ( dev-util/nvidia-cuda-sdk ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) hdf5? ( sci-libs/hdf5[mpi=] ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/metis-5 mpi? ( >=sci-libs/parmetis-4 ) ) mpi? ( virtual/mpi[cxx] ) muparser? ( dev-cpp/muParser ) opencascade? ( ~sci-libs/opencascade-7.5.3:= ) p4est? ( sci-libs/p4est[mpi] ) petsc? ( sci-mathematics/petsc[mpi=] ) scalapack? ( sci-libs/scalapack ) slepc? ( sci-mathematics/slepc[mpi=] ) sparse? ( sci-libs/umfpack ) sundials? ( sci-libs/sundials:= ) symengine? ( >=sci-libs/symengine-0.4:= ) trilinos? ( sci-libs/trilinos )
 REQUIRED_USE=p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=478b36ce24b8c7a5ae9e89fee84f3e3c
+_md5_=ca801493bc8302676fec4a06110ee02c
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.10 b/metadata/md5-cache/sci-libs/fftw-3.3.10
index dea9c47e8ada..08980b1a8386 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.10
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.10
@@ -5,11 +5,11 @@ DESCRIPTION=Fast C library for the Discrete Fourier Transform
 EAPI=7
 HOMEPAGE=https://www.fftw.org/
 IUSE=cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=3.0/3
 SRC_URI=https://www.fftw.org/fftw-3.3.10.tar.gz
 _eclasses_=fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d5e53c475cee973dfde4ebbb3bd16062
+_md5_=3c7b6e858717bfab577ca1a0a93571dd
diff --git a/metadata/md5-cache/sci-libs/gdal-3.3.3 b/metadata/md5-cache/sci-libs/gdal-3.3.3
index 7067f4811ace..3df1ceb30188 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.3.3
+++ b/metadata/md5-cache/sci-libs/gdal-3.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=7
 HOMEPAGE=https://gdal.org/
 IUSE=armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) spatialite? ( sqlite )
 SLOT=0/3.3
 SRC_URI=https://download.osgeo.org/gdal/3.3.3/gdal-3.3.3.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	8041037f74e1f9d149c038c2fe2c97cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	bf35c60a54945228d5d4cb3a5cc17f5a	java-utils-2	32fe52795e36e76dcbcf92d89bb1c4d0	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	e574a3642f886323f18f867ecc4d91c4	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=00a344155dda367beca0148ce529095c
+_md5_=e994a5f46280a8170351eebfd5ca3c6a
diff --git a/metadata/md5-cache/sci-libs/geos-3.10.0 b/metadata/md5-cache/sci-libs/geos-3.10.0
index 8ed66fa98343..89fc033886e4 100644
--- a/metadata/md5-cache/sci-libs/geos-3.10.0
+++ b/metadata/md5-cache/sci-libs/geos-3.10.0
@@ -4,9 +4,9 @@ DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://trac.osgeo.org/geos/
 IUSE=doc
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://download.osgeo.org/geos/geos-3.10.0.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=bf2f116a71c94a13bc3f38d759927ec6
+_md5_=2d6b23776a8b508bd48aa9a4506a2b31
diff --git a/metadata/md5-cache/sci-libs/proj-8.2.0 b/metadata/md5-cache/sci-libs/proj-8.2.0
index 8c3010e996b4..df94b6ad5786 100644
--- a/metadata/md5-cache/sci-libs/proj-8.2.0
+++ b/metadata/md5-cache/sci-libs/proj-8.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=PROJ coordinate transformation software
 EAPI=7
 HOMEPAGE=https://proj.org/
 IUSE=curl test +tiff
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://download.osgeo.org/proj/proj-8.2.0.tar.gz https://download.osgeo.org/proj/proj-data-1.7.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a9e04787f81857d887aa817a7f5a2b82
+_md5_=cd73c8dd4fdbba35429af386b4acfa64
diff --git a/metadata/md5-cache/sci-libs/scotch-6.1.0-r1 b/metadata/md5-cache/sci-libs/scotch-6.1.0-r1
index 4d9f5f7fb18b..9dae2d7084ae 100644
--- a/metadata/md5-cache/sci-libs/scotch-6.1.0-r1
+++ b/metadata/md5-cache/sci-libs/scotch-6.1.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Software for graph, mesh and hypergraph partitioning
 EAPI=7
 HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
 IUSE=doc int64 mpi static-libs test tools threads
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
 REQUIRED_USE=test? ( threads )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.0/scotch-v6.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b716639b78482f4f1309d01759e66043
+_md5_=3c62f064ee701f91370e73ee10a8da2e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 2a52d4be1036..c1308b0e5f0f 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/arb-2.17.0 b/metadata/md5-cache/sci-mathematics/arb-2.17.0
deleted file mode 100644
index ac9a07b95cd8..000000000000
--- a/metadata/md5-cache/sci-mathematics/arb-2.17.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
-DESCRIPTION=C library for arbitrary-precision interval arithmetic
-EAPI=7
-HOMEPAGE=http://fredrikj.net/arb/
-IUSE=static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
-SLOT=0/2
-SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.17.0.tar.gz -> arb-2.17.0.tar.gz
-_eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ffb77014ab1ba2e8ce203abf514859f5
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.18.1 b/metadata/md5-cache/sci-mathematics/arb-2.18.1
deleted file mode 100644
index 455dcb5199f6..000000000000
--- a/metadata/md5-cache/sci-mathematics/arb-2.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
-DESCRIPTION=C library for arbitrary-precision interval arithmetic
-EAPI=7
-HOMEPAGE=https://fredrikj.net/arb/
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.5.0:=
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.18.1.tar.gz -> arb-2.18.1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=02cc1f1760d5abce5573c8034f69e17d
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.19.0 b/metadata/md5-cache/sci-mathematics/arb-2.19.0
index 7d4ad7cc5d1d..fe46e24fa830 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.19.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.19.0
@@ -5,11 +5,11 @@ DESCRIPTION=C library for arbitrary-precision interval arithmetic
 EAPI=7
 HOMEPAGE=https://fredrikj.net/arb/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.19.0.tar.gz -> arb-2.19.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8cc0d62401d120d382a8072cbc26359d
+_md5_=b7de4320a8e61e0af2323ed68b1268e3
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2 b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
index 9dd76cbee64b..572f8ba63586 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
+++ b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Proof assistant written in O'Caml
 EAPI=7
 HOMEPAGE=http://coq.inria.fr/
 IUSE=gtk debug +ocamlopt doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.12.0.tar.gz -> coq-8.12.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a723ec535ee48c96c0a06abafcba3214
+_md5_=25c8cc65061801bb284df24625c245f1
diff --git a/metadata/md5-cache/sci-mathematics/gp2c-0.0.11.3 b/metadata/md5-cache/sci-mathematics/gp2c-0.0.11.3
deleted file mode 100644
index bbc84dc5c2a7..000000000000
--- a/metadata/md5-cache/sci-mathematics/gp2c-0.0.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=configure
-DEPEND=>=sci-mathematics/pari-2.11.2
-DESCRIPTION=A GP to C translator
-EAPI=7
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=test
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=>=sci-mathematics/pari-2.11.2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-0.0.11pl3.tar.gz
-_md5_=841020c135fb533b9829b0702a95a332
diff --git a/metadata/md5-cache/sci-mathematics/gp2c-0.0.12 b/metadata/md5-cache/sci-mathematics/gp2c-0.0.12
index 35b702a8d63d..13020d7faba4 100644
--- a/metadata/md5-cache/sci-mathematics/gp2c-0.0.12
+++ b/metadata/md5-cache/sci-mathematics/gp2c-0.0.12
@@ -5,10 +5,10 @@ DESCRIPTION=A GP to C translator
 EAPI=7
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=>=sci-mathematics/pari-2.11.2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-0.0.12.tar.gz
-_md5_=b0b5254292628a67be4719dfce172ccb
+_md5_=b157f93848bc2583d0b83f41ae63758a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e0f9e9f7908e..fe12cd26c8aa 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/findutils-4.8.0-r1 b/metadata/md5-cache/sys-apps/findutils-4.8.0-r1
index 6a3fc6e393e9..7d7324ab2de1 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.8.0-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.8.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GNU utilities for finding files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/findutils/
 IUSE=nls selinux static test
-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=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.8.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2baf277723b626962e8e4e7d3fef5a6d
+_md5_=3139aa4275a4dadba366888376fa36d7
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.2 b/metadata/md5-cache/sys-apps/fwupd-1.7.2-r1
similarity index 56%
rename from metadata/md5-cache/sys-apps/fwupd-1.7.2
rename to metadata/md5-cache/sys-apps/fwupd-1.7.2-r1
index bdca80d19a49..02dd20bb99ed 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.7.2
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.2-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 dev-lang/vala:0.44 ) 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 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=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/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_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
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=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
 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 kernel_linux 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 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=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/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_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
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) >=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
 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	6b67971d8a0a029d13181f2cfb9f5fa9	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	d46c125afba8be02eb1cd7104bac6e9c	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vala	ba63120449f0238a2f0c39303871ad99	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=bbdbeaa52540ef225e8dcd49d8fc034d
+_md5_=4be6467c6eff23c5c9b6a3c8c232cd9e
diff --git a/metadata/md5-cache/sys-apps/hwdata-0.353 b/metadata/md5-cache/sys-apps/hwdata-0.353
index 5c8397d4399a..4b9a76f44045 100644
--- a/metadata/md5-cache/sys-apps/hwdata-0.353
+++ b/metadata/md5-cache/sys-apps/hwdata-0.353
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=Hardware identification and configuration data
 EAPI=7
 HOMEPAGE=https://github.com/vcrhonek/hwdata
-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=GPL-2+
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.353.tar.gz -> hwdata-0.353.tar.gz
-_md5_=9b32c3215b05733ce36e80ce85e0a46d
+_md5_=ab2ff08b5f51a98da292f692ea42e1eb
diff --git a/metadata/md5-cache/sys-apps/miller-5.10.2 b/metadata/md5-cache/sys-apps/miller-5.10.2
index dbe9ef4dd997..0204509aa2e2 100644
--- a/metadata/md5-cache/sys-apps/miller-5.10.2
+++ b/metadata/md5-cache/sys-apps/miller-5.10.2
@@ -5,10 +5,10 @@ DESCRIPTION=A tool like sed, awk, cut, join, and sort for name-indexed data (CSV
 EAPI=7
 HOMEPAGE=https://johnkerl.org/miller/doc/index.html
 IUSE=doc test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/johnkerl/miller/archive/v5.10.2.tar.gz -> miller-5.10.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=eb31cc84cc38e96a199b1d87ab1ac561
+_md5_=acc28324b7e3cb0fa8a35380bbddd0e6
diff --git a/metadata/md5-cache/sys-apps/zram-generator-1.1.1 b/metadata/md5-cache/sys-apps/zram-generator-1.1.1
new file mode 100644
index 000000000000..d2ea6a3d4764
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/zram-generator-1.1.1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/rust virtual/pkgconfig man? ( app-text/ronn-ng ) >=virtual/rust-1.53 virtual/pkgconfig
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Systemd unit generator for zram swap devices
+EAPI=8
+HOMEPAGE=https://github.com/systemd/zram-generator
+IUSE=+man debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT
+SLOT=0
+SRC_URI=https://github.com/systemd/zram-generator/archive/refs/tags/v1.1.1.tar.gz -> zram-generator-1.1.1.tar.gz https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/anyhow/1.0.51/download -> anyhow-1.0.51.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.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/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/dlv-list/0.2.3/download -> dlv-list-0.2.3.crate https://crates.io/api/v1/crates/fasteval/0.2.4/download -> fasteval-0.2.4.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/libc/0.2.109/download -> libc-0.2.109.crate https://crates.io/api/v1/crates/liboverdrop/0.0.2/download -> liboverdrop-0.0.2.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/nix/0.23.0/download -> nix-0.23.0.crate https://crates.io/api/v1/crates/ordered-multimap/0.3.1/download -> ordered-multimap-0.3.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.32/download -> proc-macro2-1.0.32.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.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/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-ini/0.17.0/download -> rust-ini-0.17.0.crate https://crates.io/api/v1/crates/syn/1.0.82/download -> syn-1.0.82.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.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/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	c7fefacaebdcb455d2a7b59429eb47a6	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=8a64b61d8db5d437284a607085720ee5
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 69262c1a3bc4..569f403dcf64 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/polkit-0.120-r1 b/metadata/md5-cache/sys-auth/polkit-0.120-r1
index 384f29be620c..9981ae6b1d8e 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.120-r1
+++ b/metadata/md5-cache/sys-auth/polkit-0.120-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit https://gitlab.freedesktop.org/polkit/polkit
 IUSE=examples gtk +introspection kde pam selinux systemd test
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent )
 RDEPEND=dev-lang/spidermonkey:78[-debug] dev-libs/glib:2 dev-libs/expat pam? ( sys-auth/pambase sys-libs/pam ) !pam? ( virtual/libcrypt:= ) systemd? ( sys-apps/systemd:0=[policykit] ) !systemd? ( sys-auth/elogind ) acct-user/polkitd selinux? ( sec-policy/selinux-policykit )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.120.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	41ce39f668e11d31ff4734f3b5794f7d	pax-utils	fce6ad998516159787b92e8043167889	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0cb32274e220da30b5c51d01eaa3e88c
+_md5_=8b891aca62b98e030bfc7d1f3e71967f
diff --git a/metadata/md5-cache/sys-auth/seatd-0.6.3 b/metadata/md5-cache/sys-auth/seatd-0.6.3
index 8d52cdaa5a63..63760fa773d2 100644
--- a/metadata/md5-cache/sys-auth/seatd-0.6.3
+++ b/metadata/md5-cache/sys-auth/seatd-0.6.3
@@ -5,11 +5,11 @@ DESCRIPTION=Minimal seat management daemon and universal library
 EAPI=8
 HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
 IUSE=builtin elogind +server systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) server? ( acct-group/seat )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
 SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.6.3.tar.gz -> seatd-0.6.3.tar.gz
 _eclasses_=meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	a8b7938ade305f087865de7e52d079b5	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=19124dbf5d522b58edf0fbe16ad0345c
+_md5_=8f3e9ad18a2a8cc23706264034ed1bcb
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index ad1ed9240670..8faaa9725edc 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.7.0 b/metadata/md5-cache/sys-block/ms-sys-2.7.0
index 2efba422d976..fc1751a965eb 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.7.0
+++ b/metadata/md5-cache/sys-block/ms-sys-2.7.0
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A command-line program for writing Microsoft compatible boot records
 EAPI=7
 HOMEPAGE=http://ms-sys.sourceforge.net
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.7.0.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=57009645020f4cf73a680112fd777f4b
+_md5_=cef1f785945e17dc5f4470c77560d3fe
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 02a7ac7c790e..b081193ccfac 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/refind-0.13.2 b/metadata/md5-cache/sys-boot/refind-0.13.2
index dd1af86e6676..8b76c17fffd2 100644
--- a/metadata/md5-cache/sys-boot/refind-0.13.2
+++ b/metadata/md5-cache/sys-boot/refind-0.13.2
@@ -4,9 +4,9 @@ DESCRIPTION=The UEFI Boot Manager by Rod Smith
 EAPI=7
 HOMEPAGE=https://www.rodsbooks.com/refind/
 IUSE=btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs custom-cflags doc
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2 GPL-3 FDL-1.3
 SLOT=0
 SRC_URI=mirror://sourceforge/project/refind/0.13.2/refind-src-0.13.2.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=67fda57a6aa68f782c4c2cb7cddee3ee
+_md5_=65fc5500709da41e24e0634e431baf59
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 5ac88e843c28..fb0104cd49f1 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/binutils-2.37_p1-r1 b/metadata/md5-cache/sys-devel/binutils-2.37_p1-r1
index ae00717113ab..91cea50b1e02 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.37_p1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.37_p1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.37
 SRC_URI=mirror://gnu/binutils/binutils-2.37_p1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37_p1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.37_p1-patches-1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68a9b4106751a2a3da65c43190b9b4ac
+_md5_=dfebdd3c0c058546b7720ed77640038a
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 6b2f26e3d84c..3068c59565da 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=adee6fba5cbcf8f0d4fb8b936cf95b63
+_md5_=01cee77511fa0ac97ddfe864a8caacb5
diff --git a/metadata/md5-cache/sys-devel/bison-3.8.2 b/metadata/md5-cache/sys-devel/bison-3.8.2
index b03f58d2ffcd..85192e6001be 100644
--- a/metadata/md5-cache/sys-devel/bison-3.8.2
+++ b/metadata/md5-cache/sys-devel/bison-3.8.2
@@ -5,11 +5,11 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/bison/
 IUSE=examples nls static test
-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-2
 RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.8.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7697d0eb8c0bbe4785b5b09337de1d11
+_md5_=ca4b2e1ddff8fb18cef4936d78f84339
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.0 b/metadata/md5-cache/sys-devel/lld-13.0.0
index 7f22f932ce77..17519a032bf9 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.0
+++ b/metadata/md5-cache/sys-devel/lld-13.0.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=dbfa5409744dcf54791bfd0d07032bee
+_md5_=7e8f0f76f18f766fd0ca694bbaddff5b
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1.9999 b/metadata/md5-cache/sys-devel/lld-13.0.1.9999
index 24b58f09074a..9bf7256d3886 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.1.9999
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1.9999
@@ -11,4 +11,4 @@ RDEPEND=~sys-devel/llvm-13.0.1.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d5f1e4b824d07405012d0a6a0fe1acf0
+_md5_=9e7a3a3cff49ad03eb299f81fe16ec53
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1_rc1 b/metadata/md5-cache/sys-devel/lld-13.0.1_rc1
index 6d1e677dd4e8..410fe9dcfa1f 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.1_rc1
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1_rc1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1-rc1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d5f1e4b824d07405012d0a6a0fe1acf0
+_md5_=9e7a3a3cff49ad03eb299f81fe16ec53
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.0.9999 b/metadata/md5-cache/sys-devel/lld-14.0.0.9999
index 2e7b1cd43525..8813c685ca70 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-14.0.0.9999
@@ -11,4 +11,4 @@ RDEPEND=~sys-devel/llvm-14.0.0.9999
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d5f1e4b824d07405012d0a6a0fe1acf0
+_md5_=9e7a3a3cff49ad03eb299f81fe16ec53
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 318d7dff2552..885481e6cda2 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11 b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
index d953d53955c2..4b461acab2f1 100644
--- a/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
+++ b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare pretend
 DESCRIPTION=Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs
 EAPI=7
 HOMEPAGE=https://github.com/RPi-Distro/firmware-nonfree https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree
-KEYWORDS=~arm ~arm64
+KEYWORDS=arm arm64
 LICENSE=Broadcom
 RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
 SLOT=0
 SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20190114-1+rpt11.debian.tar.xz
-_md5_=75388c51227af6115e476b362c87e23a
+_md5_=59215fed204c3e7eccf0f0298a8a7c95
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 8143e596b33f..8c032bbc1e87 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/encfs-1.9.5 b/metadata/md5-cache/sys-fs/encfs-1.9.5
deleted file mode 100644
index f8f9cca8b50e..000000000000
--- a/metadata/md5-cache/sys-fs/encfs-1.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= dev-libs/tinyxml2:0= sys-fs/fuse:= sys-libs/zlib dev-lang/perl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An implementation of encrypted filesystem in user-space using FUSE
-EAPI=6
-HOMEPAGE=https://vgough.github.io/encfs/
-IUSE=nls
-KEYWORDS=amd64 arm ~ppc64 ~sparc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=dev-libs/openssl:0= dev-libs/tinyxml2:0= sys-fs/fuse:= sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/vgough/encfs/archive/v1.9.5.tar.gz -> encfs-1.9.5.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=7ba5526f6e00c48fe98e82ba341bd58b
diff --git a/metadata/md5-cache/sys-fs/encfs-1.9.5-r2 b/metadata/md5-cache/sys-fs/encfs-1.9.5-r2
new file mode 100644
index 000000000000..9352f49e832f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/encfs-1.9.5-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl sys-devel/gettext virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:= dev-libs/tinyxml2:= sys-fs/fuse:0= sys-libs/zlib
+DESCRIPTION=An implementation of encrypted filesystem in user-space using FUSE
+EAPI=7
+HOMEPAGE=https://vgough.github.io/encfs/
+IUSE=nls
+KEYWORDS=~amd64 ~arm ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=dev-libs/openssl:= dev-libs/tinyxml2:= sys-fs/fuse:0= sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vgough/encfs/archive/v1.9.5.tar.gz -> encfs-1.9.5.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9a2ee3f8d9581210a4713a45d8c13e98
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.7 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.7
index 21e73efcd3df..06f23845ce1e 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.7
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.7
@@ -5,11 +5,11 @@ DESCRIPTION=Device mapper target autoconfig
 EAPI=7
 HOMEPAGE=http://christophe.varoqui.free.fr/
 IUSE=systemd rbd test kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2-2.02.45 >=virtual/libudev-232-r3 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/opensvc/multipath-tools/archive/refs/tags/0.8.7.tar.gz -> multipath-tools-0.8.7.tar.gz
 _eclasses_=linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=1dcb9c8c572adb92f90e7ac46c5e895b
+_md5_=92c909b318376ba52fccbeed4375c574
diff --git a/metadata/md5-cache/sys-fs/udisks-2.9.4 b/metadata/md5-cache/sys-fs/udisks-2.9.4
index 8f964975df89..2344e2fdc390 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.9.4
+++ b/metadata/md5-cache/sys-fs/udisks-2.9.4
@@ -5,11 +5,11 @@ DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
 IUSE=acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=sys-auth/polkit-0.114 >=sys-libs/libblockdev-2.25[cryptsetup,lvm?,vdo?] virtual/udev acl? ( virtual/acl ) daemon? ( >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=dev-libs/libgudev-165:= ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) zram? ( >=sys-libs/libblockdev-2.25[kbd] ) >=sys-block/parted-3 >=sys-apps/util-linux-2.30 selinux? ( sec-policy/selinux-devicekit ) virtual/tmpfiles
 REQUIRED_USE=?? ( elogind systemd ) elogind? ( daemon ) systemd? ( daemon ) zram? ( systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=11088cad6fd69deb833cb25080ae8327
+_md5_=0b10193d8dc7d66bd035f510f1a214a4
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.14.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.14.2
similarity index 94%
rename from metadata/md5-cache/sys-fs/xfsprogs-5.14.0
rename to metadata/md5-cache/sys-fs/xfsprogs-5.14.2
index 542bb1756586..81eeea77b7a8 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.14.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.14.2
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/util-linux-2.17.2 dev-libs/inih dev-libs/userspace-rcu icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) selinux? ( sec-policy/selinux-xfs )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.14.0.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.14.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ede11f579a547f1dbbdce2a3996f709d
+_md5_=fb49a06929dcd3f20e2a27985c55740d
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index c92839850af0..1eae6faa9056 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.6.8 b/metadata/md5-cache/sys-libs/freeipmi-1.6.8
index 0de6b05c2e49..8da2941d5830 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.6.8
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.6.8
@@ -4,9 +4,9 @@ DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/freeipmi/
 IUSE=debug nagios
-KEYWORDS=amd64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 hppa ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://gnu/freeipmi/freeipmi-1.6.8.tar.gz
-_md5_=d2e1fa95517a4dfd8a6368913b4f1655
+_md5_=403c5b0fb37145e22558148b49b80526
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 1f83c65194a8..6a949de5a543 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/nmon-16m b/metadata/md5-cache/sys-process/nmon-16m
index 65380234a864..fdf7f7053398 100644
--- a/metadata/md5-cache/sys-process/nmon-16m
+++ b/metadata/md5-cache/sys-process/nmon-16m
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
 EAPI=7
 HOMEPAGE=http://nmon.sourceforge.net/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/nmon/lmon16m.c
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a9be6371215f633e2b6450196bcafea
+_md5_=907cf6328d5a4ec40916d1063c3fb525
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ded17607cbab..ecd6983f0cee 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/dillo-3.1_pre20181005 b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
index d4e06d30aaca..43cf8d89bad8 100644
--- a/metadata/md5-cache/www-client/dillo-3.1_pre20181005
+++ b/metadata/md5-cache/www-client/dillo-3.1_pre20181005
@@ -5,10 +5,10 @@ DESCRIPTION=Lean FLTK based web browser
 EAPI=7
 HOMEPAGE=https://www.dillo.org/
 IUSE=doc +gif ipv6 +jpeg +png ssl +xembed
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/dillo-3.1_pre20181005.tar.xz mirror://gentoo/dillo.png
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4b66d835ec72e021e359bb81eacfe988	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=20ed01c1b7866200a62d96dcef5761fe
+_md5_=617d9b271f6d37c05c168652d9efbe04
diff --git a/metadata/md5-cache/www-client/firefox-91.4.0 b/metadata/md5-cache/www-client/firefox-91.4.0
new file mode 100644
index 000000000000..285c685ae032
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-91.4.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang: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.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) 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-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 kernel_linux pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) wifi? ( dbus ) screencast? ( wayland )
+SLOT=0/esr91
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/source/firefox-91.4.0esr.source.tar.xz -> firefox-91.4.0esr.source.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-02.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/af.xpi -> firefox-91.4.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ar.xpi -> firefox-91.4.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ast.xpi -> firefox-91.4.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/be.xpi -> firefox-91.4.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/bg.xpi -> firefox-91.4.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/br.xpi -> firefox-91.4.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ca.xpi -> firefox-91.4.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/cak.xpi -> firefox-91.4.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/cs.xpi -> firefox-91.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/cy.xpi -> firefox-91.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/da.xpi -> firefox-91.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/de.xpi -> firefox-91.4.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-91.4.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/el.xpi -> firefox-91.4.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-91.4.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-91.4.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-91.4.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-91.4.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/et.xpi -> firefox-91.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/eu.xpi -> firefox-91.4.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fi.xpi -> firefox-91.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fr.xpi -> firefox-91.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gd.xpi -> firefox-91.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gl.xpi -> firefox-91.4.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/he.xpi -> firefox-91.4.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hr.xpi -> firefox-91.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-91.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hu.xpi -> firefox-91.4.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/id.xpi -> firefox-91.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/is.xpi -> firefox-91.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/it.xpi -> firefox-91.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ja.xpi -> firefox-91.4.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ka.xpi -> firefox-91.4.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/kab.xpi -> firefox-91.4.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/kk.xpi -> firefox-91.4.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ko.xpi -> firefox-91.4.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/lt.xpi -> firefox-91.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/lv.xpi -> firefox-91.4.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ms.xpi -> firefox-91.4.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.4.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/nl.xpi -> firefox-91.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.4.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pl.xpi -> firefox-91.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/rm.xpi -> firefox-91.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ro.xpi -> firefox-91.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ru.xpi -> firefox-91.4.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sk.xpi -> firefox-91.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sl.xpi -> firefox-91.4.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sq.xpi -> firefox-91.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sr.xpi -> firefox-91.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.4.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/th.xpi -> firefox-91.4.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/tr.xpi -> firefox-91.4.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/uk.xpi -> firefox-91.4.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/uz.xpi -> firefox-91.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/vi.xpi -> firefox-91.4.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.4.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ach.xpi -> firefox-91.4.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/an.xpi -> firefox-91.4.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/az.xpi -> firefox-91.4.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/bn.xpi -> firefox-91.4.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/bs.xpi -> firefox-91.4.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.4.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/eo.xpi -> firefox-91.4.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-91.4.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-91.4.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fa.xpi -> firefox-91.4.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ff.xpi -> firefox-91.4.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gn.xpi -> firefox-91.4.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.4.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.4.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.4.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ia.xpi -> firefox-91.4.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/km.xpi -> firefox-91.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/kn.xpi -> firefox-91.4.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/lij.xpi -> firefox-91.4.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/mk.xpi -> firefox-91.4.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/mr.xpi -> firefox-91.4.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/my.xpi -> firefox-91.4.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.4.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/oc.xpi -> firefox-91.4.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sco.xpi -> firefox-91.4.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/si.xpi -> firefox-91.4.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/son.xpi -> firefox-91.4.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/szl.xpi -> firefox-91.4.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ta.xpi -> firefox-91.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/te.xpi -> firefox-91.4.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/tl.xpi -> firefox-91.4.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/trs.xpi -> firefox-91.4.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ur.xpi -> firefox-91.4.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/xh.xpi -> firefox-91.4.0esr-xh.xpi )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e7ed6ca8be097c58caee6f78e6f7910c
diff --git a/metadata/md5-cache/www-client/firefox-95.0 b/metadata/md5-cache/www-client/firefox-95.0
new file mode 100644
index 000000000000..4523cef74e50
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-95.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.10[ncurses,sqlite,ssl] dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang: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.72 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) 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-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) 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-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 kernel_linux pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.72 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) 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-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
+SLOT=0/95
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/95.0/source/firefox-95.0.source.tar.xz -> firefox-95.0.source.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-95-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-95-patches-01.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/af.xpi -> firefox-95.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ar.xpi -> firefox-95.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ast.xpi -> firefox-95.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/be.xpi -> firefox-95.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/bg.xpi -> firefox-95.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/br.xpi -> firefox-95.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ca.xpi -> firefox-95.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/cak.xpi -> firefox-95.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/cs.xpi -> firefox-95.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/cy.xpi -> firefox-95.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/da.xpi -> firefox-95.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/de.xpi -> firefox-95.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/dsb.xpi -> firefox-95.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/el.xpi -> firefox-95.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/en-CA.xpi -> firefox-95.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/en-GB.xpi -> firefox-95.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-AR.xpi -> firefox-95.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-ES.xpi -> firefox-95.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/et.xpi -> firefox-95.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/eu.xpi -> firefox-95.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fi.xpi -> firefox-95.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fr.xpi -> firefox-95.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-95.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-95.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gd.xpi -> firefox-95.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gl.xpi -> firefox-95.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/he.xpi -> firefox-95.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hr.xpi -> firefox-95.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hsb.xpi -> firefox-95.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hu.xpi -> firefox-95.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/id.xpi -> firefox-95.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/is.xpi -> firefox-95.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/it.xpi -> firefox-95.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ja.xpi -> firefox-95.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ka.xpi -> firefox-95.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/kab.xpi -> firefox-95.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/kk.xpi -> firefox-95.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ko.xpi -> firefox-95.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/lt.xpi -> firefox-95.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/lv.xpi -> firefox-95.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ms.xpi -> firefox-95.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-95.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/nl.xpi -> firefox-95.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-95.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-95.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pl.xpi -> firefox-95.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-95.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-95.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/rm.xpi -> firefox-95.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ro.xpi -> firefox-95.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ru.xpi -> firefox-95.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sk.xpi -> firefox-95.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sl.xpi -> firefox-95.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sq.xpi -> firefox-95.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sr.xpi -> firefox-95.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-95.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/th.xpi -> firefox-95.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/tr.xpi -> firefox-95.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/uk.xpi -> firefox-95.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/uz.xpi -> firefox-95.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/vi.xpi -> firefox-95.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-95.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-95.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ach.xpi -> firefox-95.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/an.xpi -> firefox-95.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/az.xpi -> firefox-95.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/bn.xpi -> firefox-95.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/bs.xpi -> firefox-95.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-95.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/eo.xpi -> firefox-95.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-CL.xpi -> firefox-95.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-MX.xpi -> firefox-95.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fa.xpi -> firefox-95.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ff.xpi -> firefox-95.0-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gn.xpi -> firefox-95.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-95.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-95.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-95.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ia.xpi -> firefox-95.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/km.xpi -> firefox-95.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/kn.xpi -> firefox-95.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/lij.xpi -> firefox-95.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/mk.xpi -> firefox-95.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/mr.xpi -> firefox-95.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/my.xpi -> firefox-95.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-95.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/oc.xpi -> firefox-95.0-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sco.xpi -> firefox-95.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/si.xpi -> firefox-95.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/son.xpi -> firefox-95.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/szl.xpi -> firefox-95.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ta.xpi -> firefox-95.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/te.xpi -> firefox-95.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/tl.xpi -> firefox-95.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/trs.xpi -> firefox-95.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ur.xpi -> firefox-95.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/xh.xpi -> firefox-95.0-xh.xpi )
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	check-reqs	bfb51de63b0462097e40436214dd43c8	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	gnome2-utils	355c758ccc0d6df60d43a066640e642c	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	llvm	19c0cdeff39b0e08d1454df31b588316	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	a8b7938ade305f087865de7e52d079b5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=caf58ed6527b53d822b424bbde2d76f1
diff --git a/metadata/md5-cache/www-client/firefox-bin-91.4.0 b/metadata/md5-cache/www-client/firefox-bin-91.4.0
new file mode 100644
index 000000000000..1f0ee60b921d
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-91.4.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/esr91
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/en-US/firefox-91.4.0esr.tar.bz2 -> firefox-bin_x86_64-91.4.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-i686/en-US/firefox-91.4.0esr.tar.bz2 -> firefox-bin_i686-91.4.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ach.xpi -> firefox-91.4.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/af.xpi -> firefox-91.4.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/an.xpi -> firefox-91.4.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ar.xpi -> firefox-91.4.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ast.xpi -> firefox-91.4.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/az.xpi -> firefox-91.4.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/be.xpi -> firefox-91.4.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/bg.xpi -> firefox-91.4.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/bn.xpi -> firefox-91.4.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/br.xpi -> firefox-91.4.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/bs.xpi -> firefox-91.4.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-91.4.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ca.xpi -> firefox-91.4.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/cak.xpi -> firefox-91.4.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/cs.xpi -> firefox-91.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/cy.xpi -> firefox-91.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/da.xpi -> firefox-91.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/de.xpi -> firefox-91.4.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-91.4.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/el.xpi -> firefox-91.4.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-91.4.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-91.4.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/eo.xpi -> firefox-91.4.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-91.4.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-91.4.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-91.4.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-91.4.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/et.xpi -> firefox-91.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/eu.xpi -> firefox-91.4.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fa.xpi -> firefox-91.4.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ff.xpi -> firefox-91.4.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fi.xpi -> firefox-91.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fr.xpi -> firefox-91.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-91.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-91.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gd.xpi -> firefox-91.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gl.xpi -> firefox-91.4.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gn.xpi -> firefox-91.4.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-91.4.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/he.xpi -> firefox-91.4.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-91.4.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hr.xpi -> firefox-91.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-91.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hu.xpi -> firefox-91.4.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-91.4.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ia.xpi -> firefox-91.4.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/id.xpi -> firefox-91.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/is.xpi -> firefox-91.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/it.xpi -> firefox-91.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ja.xpi -> firefox-91.4.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ka.xpi -> firefox-91.4.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/kab.xpi -> firefox-91.4.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/kk.xpi -> firefox-91.4.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/km.xpi -> firefox-91.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/kn.xpi -> firefox-91.4.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ko.xpi -> firefox-91.4.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/lij.xpi -> firefox-91.4.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/lt.xpi -> firefox-91.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/lv.xpi -> firefox-91.4.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/mk.xpi -> firefox-91.4.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/mr.xpi -> firefox-91.4.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ms.xpi -> firefox-91.4.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/my.xpi -> firefox-91.4.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-91.4.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-91.4.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/nl.xpi -> firefox-91.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-91.4.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/oc.xpi -> firefox-91.4.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-91.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pl.xpi -> firefox-91.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-91.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-91.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/rm.xpi -> firefox-91.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ro.xpi -> firefox-91.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ru.xpi -> firefox-91.4.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/si.xpi -> firefox-91.4.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sk.xpi -> firefox-91.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sl.xpi -> firefox-91.4.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/son.xpi -> firefox-91.4.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sq.xpi -> firefox-91.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sr.xpi -> firefox-91.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-91.4.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ta.xpi -> firefox-91.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/te.xpi -> firefox-91.4.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/th.xpi -> firefox-91.4.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/tl.xpi -> firefox-91.4.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/tr.xpi -> firefox-91.4.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/trs.xpi -> firefox-91.4.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/uk.xpi -> firefox-91.4.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/ur.xpi -> firefox-91.4.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/uz.xpi -> firefox-91.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/vi.xpi -> firefox-91.4.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/xh.xpi -> firefox-91.4.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-91.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/91.4.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-91.4.0esr-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=56d1436949c584d0eef9c436c3015b3e
diff --git a/metadata/md5-cache/www-client/firefox-bin-95.0 b/metadata/md5-cache/www-client/firefox-bin-95.0
new file mode 100644
index 000000000000..dd59b8b5facd
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-95.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/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/95
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/en-US/firefox-95.0.tar.bz2 -> firefox-bin_x86_64-95.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-i686/en-US/firefox-95.0.tar.bz2 -> firefox-bin_i686-95.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ach.xpi -> firefox-95.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/af.xpi -> firefox-95.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/an.xpi -> firefox-95.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ar.xpi -> firefox-95.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ast.xpi -> firefox-95.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/az.xpi -> firefox-95.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/be.xpi -> firefox-95.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/bg.xpi -> firefox-95.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/bn.xpi -> firefox-95.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/br.xpi -> firefox-95.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/bs.xpi -> firefox-95.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-95.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ca.xpi -> firefox-95.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/cak.xpi -> firefox-95.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/cs.xpi -> firefox-95.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/cy.xpi -> firefox-95.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/da.xpi -> firefox-95.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/de.xpi -> firefox-95.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/dsb.xpi -> firefox-95.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/el.xpi -> firefox-95.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/en-CA.xpi -> firefox-95.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/en-GB.xpi -> firefox-95.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/eo.xpi -> firefox-95.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-AR.xpi -> firefox-95.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-CL.xpi -> firefox-95.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-ES.xpi -> firefox-95.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/es-MX.xpi -> firefox-95.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/et.xpi -> firefox-95.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/eu.xpi -> firefox-95.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fa.xpi -> firefox-95.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ff.xpi -> firefox-95.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fi.xpi -> firefox-95.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fr.xpi -> firefox-95.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-95.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-95.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gd.xpi -> firefox-95.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gl.xpi -> firefox-95.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gn.xpi -> firefox-95.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-95.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/he.xpi -> firefox-95.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-95.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hr.xpi -> firefox-95.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hsb.xpi -> firefox-95.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hu.xpi -> firefox-95.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-95.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ia.xpi -> firefox-95.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/id.xpi -> firefox-95.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/is.xpi -> firefox-95.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/it.xpi -> firefox-95.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ja.xpi -> firefox-95.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ka.xpi -> firefox-95.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/kab.xpi -> firefox-95.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/kk.xpi -> firefox-95.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/km.xpi -> firefox-95.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/kn.xpi -> firefox-95.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ko.xpi -> firefox-95.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/lij.xpi -> firefox-95.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/lt.xpi -> firefox-95.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/lv.xpi -> firefox-95.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/mk.xpi -> firefox-95.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/mr.xpi -> firefox-95.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ms.xpi -> firefox-95.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/my.xpi -> firefox-95.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-95.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-95.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/nl.xpi -> firefox-95.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-95.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/oc.xpi -> firefox-95.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-95.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pl.xpi -> firefox-95.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-95.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-95.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/rm.xpi -> firefox-95.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ro.xpi -> firefox-95.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ru.xpi -> firefox-95.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/si.xpi -> firefox-95.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sk.xpi -> firefox-95.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sl.xpi -> firefox-95.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/son.xpi -> firefox-95.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sq.xpi -> firefox-95.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sr.xpi -> firefox-95.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-95.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ta.xpi -> firefox-95.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/te.xpi -> firefox-95.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/th.xpi -> firefox-95.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/tl.xpi -> firefox-95.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/tr.xpi -> firefox-95.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/trs.xpi -> firefox-95.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/uk.xpi -> firefox-95.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/ur.xpi -> firefox-95.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/uz.xpi -> firefox-95.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/vi.xpi -> firefox-95.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/xh.xpi -> firefox-95.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-95.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/95.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-95.0-zh-TW.xpi )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	6b67971d8a0a029d13181f2cfb9f5fa9	multilib	4b66d835ec72e021e359bb81eacfe988	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a1384f7cd0d6b2369776af25835f2cf5
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 4b12283b24e9..7236a751b178 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/monitorix-3.13.1 b/metadata/md5-cache/www-misc/monitorix-3.13.1
index 3d02f2949337..4cf58102655b 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.13.1
+++ b/metadata/md5-cache/www-misc/monitorix-3.13.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=A lightweight system monitoring tool
 EAPI=7
 HOMEPAGE=https://www.monitorix.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=acct-user/monitorix acct-group/monitorix dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.13.1.tar.gz
 _eclasses_=multilib	4b66d835ec72e021e359bb81eacfe988	optfeature	30ce9dec2b8943338c9b015bd32bac6a	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d1037ca262ce1436e37dadd3129b7471
+_md5_=303ff4a249793909e3a83bf9ddd55783
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 732ab89f213c..46a5c77e1c4f 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/luit-20210218 b/metadata/md5-cache/x11-apps/luit-20210218
index a2b1395ec12f..32f04fdaa801 100644
--- a/metadata/md5-cache/x11-apps/luit-20210218
+++ b/metadata/md5-cache/x11-apps/luit-20210218
@@ -4,9 +4,9 @@ DEPEND=sys-libs/zlib virtual/libiconv
 DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
 EAPI=7
 HOMEPAGE=https://invisible-island.net/luit/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/luit/luit-20210218.tgz
-_md5_=206b3e552795af6071d86c19da5e84f2
+_md5_=6e66ff18dc267a43f5cd8da4e54af82c
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e22e42a12ef7..aa962de06dd0 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/fbpager-20090221-r2 b/metadata/md5-cache/x11-misc/fbpager-20090221-r2
index 2046a99259f6..0606e31cb422 100644
--- a/metadata/md5-cache/x11-misc/fbpager-20090221-r2
+++ b/metadata/md5-cache/x11-misc/fbpager-20090221-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A Pager for fluxbox
 EAPI=7
 HOMEPAGE=http://git.fluxbox.org/fbpager.git/
 IUSE=+xrender
-KEYWORDS=amd64 ~mips ppc ~sparc ~x86
+KEYWORDS=amd64 ~mips ppc ~sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 xrender? ( x11-libs/libXrender )
 SLOT=0
 SRC_URI=mirror://gentoo/fbpager-20090221.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=501453d21b9fc7d347e24bba24a8f696
+_md5_=246e8c014ab97f48720d888fd903df03
diff --git a/metadata/md5-cache/x11-misc/shutter-0.99.2 b/metadata/md5-cache/x11-misc/shutter-0.99.2
index 73a1dd2a035e..fa5ca8bd6066 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.99.2
+++ b/metadata/md5-cache/x11-misc/shutter-0.99.2
@@ -3,10 +3,10 @@ DEFINED_PHASES=install postinst postrm preinst prepare
 DESCRIPTION=Feature-rich screenshot program
 EAPI=8
 HOMEPAGE=https://shutter-project.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 >=dev-perl/Gtk3-ImageView-10 dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.99.2.tar.gz -> shutter-0.99.2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e68ca011a00944d065a81c4329b8981d
+_md5_=959f0b74b90a99ca8d877a3a9059e024
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 7bc9fe0e753b..935bc74f8608 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/sakura-3.8.3 b/metadata/md5-cache/x11-terms/sakura-3.8.3
index dfa04f1e2eca..ef848ba497e7 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.8.3
+++ b/metadata/md5-cache/x11-terms/sakura-3.8.3
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:3[X] x11-libs/pango x11-libs/vte:2.91 x11-b
 DESCRIPTION=GTK/VTE based terminal emulator
 EAPI=8
 HOMEPAGE=https://www.pleyades.net/david/projects/sakura
-KEYWORDS=amd64 ~x86 ~x86-linux
+KEYWORDS=amd64 x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3[X] x11-libs/pango x11-libs/vte:2.91
 SLOT=0
 SRC_URI=https://launchpad.net/sakura/trunk/3.8.3/+download/sakura-3.8.3.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=7dd53e1eb53c636fc34b94eacee6a120
+_md5_=b5107ad06bafc5b77257ec5b53993716
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2f49a138eb8a..639c76ef7404 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15567 BLAKE2B cd532bfb719406d28a57b3ff201e523cf2465ccb1ef12e028056ad08a70f52dac0ff2cdc2a1a6becac028f9420789fb8a7eccc136e85b813e2211dafca969b00 SHA512 4e4ccf855d52fe6ae642b0d51ffccea68f2f449bae6351a417bf21dc995a0926b8f758b22b2da537dd40a13b2b13e05609df664d895495aa3ba215abacbda0be
-TIMESTAMP 2021-12-06T06:39:17Z
+TIMESTAMP 2021-12-07T14:39:16Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGtsBVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGvchRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBZ6g//Zs6YNpfOqbBLLA4BWsbDkvvRVEzvNODrbg+ilZuypG8zWX0opXWUOmVV
-V8BfX4t253nQTVxNP95xFo7Gvn3oFTukFgb6Z7uXxhslqOLiClP4c6E/x4Cpxtam
-p+yFMzx/tD7wG4mq/Yh6wl3Ao+3OCY3AZuIejt+sLpHe1aeutkGypLuNK96uXV7J
-D6pdjPN6xLCMVwa+HBw2MSOq2VJsMUGGBIjRu61HDei6c2l2xQBofcXwYlXqHdpH
-RxX3ZyqkG1NnAJsWF98vPfyzpzQ4P1U5ywwpKj50uro1cUFRz+6GD5nAJiCrs+UV
-RTKRaQOWH55EO9oZb7Xr68VlLkO4HYMRaePVBBncsDdvG1zNubScGvbbmHDEJQqC
-TTBRhIVl/COL5tzqt48J/f75r3q3rP7TYkq0LPM1wPexV8vByPu+9yybgdcJfXsE
-Fl59cGf8J24llVBX9PnC4zvmsGbPm+CnuS2wCzDWjDAgPnWdyez5MngumZyL1V1b
-afUXR0+P+E6uWMYyPHp3n+5M2+CH86zmthZDGh00/UrYVrfgSVZMOi+qjDDf0USO
-a0k/z3WdKIujDZ5XKquqQNuSO18IC9gBLlDPnuJMXFgO+7Eu2W9JjMBLl69NQFHV
-WDHykjBhINoblV5s51BRu/MDfCt2L5M5wnClfEN0iwoMhjeGymg=
-=xTkb
+klAgZA/9FCxi/FiGYJhJrVW/c41q9cd46GAl6wClZki0nVclL16VUYn+/U4HgO0g
+/J2V/pFIsKRxePUeOp3ngMDMu/M+Y2r9x12KGFjpVwvXRRJU4WbjJvNBx+w851FC
+q6g0Um53MCiYcqDCBWXIw9XDbgmz/0o6N7SAWhnTyv1wepf/njyYJH1XZdUPUvf/
+sp8qvdKgMn5UXziKtHbTb9OBsjRsFbzFRy3meQ+wVR66ZCdHioidOsI5bWSKcOJ1
+yOZAGvlKk/6bPD8TIG/azUZmxT5tVJQudrkXQezTBzWunUR+xCdHKQvlxqqhOkH4
+KEP55+ogXYoIYr6X2YTvU9r4elRpb/upDADccO76WlfSmEqUXLftbnni1P72a2TH
+eC+ZYObHl+7nClHBeLa2t/ycPvG/0YF+l5b1UCCoPrCTPo93EcCMwrSh1CvgqBRQ
+9z0hnj0a0xaigm2371dthWQmMafom3eKXLuYY4iD9b0plefgMzq/znsvU9BSQgsI
+dB11G4udhTliNAVU2WEpSAK8wnF+ox9vbu87/WhQeR36MOK4OjCqHyoUR/+K6+LF
+NBCeCPLDmrKKr12VsYiTBCEYSS7S2DUV4ZY4xt4iv0kUKB8xQieJ+Vr5jZic/G0h
+D+yr6fTSKR9ZoW2GEJ2B7dw3/yQ+7gHmJ63a4CVkdMYCc8k5yxY=
+=U3rE
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 35f4ee390dbd..61d39a8868cd 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Dec 2021 06:39:13 +0000
+Tue, 07 Dec 2021 14:39:11 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 2a80c0261080..f3c03f486e83 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -545,10 +545,6 @@
       <email>prometheanfire@gentoo.org</email>
       <name>Matthew Thode</name>
     </member>
-    <member>
-      <email>ultrabug@gentoo.org</email>
-      <name>Ultrabug</name>
-    </member>
     <member>
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
@@ -1962,6 +1958,10 @@
       <name>Jonas Stein</name>
       <role>liquidator</role>
     </member>
+    <member>
+      <email>sam@gentoo.org</email>
+      <name>Sam James</name>
+    </member>
     <member>
       <email>vapier@gentoo.org</email>
       <name>Mike Frysinger</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index cbe2f09a4196..3da662bde64c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec  6 06:39:13 AM UTC 2021
+Tue Dec  7 02:39:11 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 9280d817f020..f32401bcf8f9 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -449,6 +449,7 @@
 2011290239 ./acct-group/ziproxy/ziproxy-0.ebuild
 2012281255 ./acct-group/znc/znc-0-r1.ebuild
 2107101509 ./acct-group/zookeeper/zookeeper-0.ebuild
+2112071409 ./acct-group/ejabberd/ejabberd-0.ebuild
 2012281255 ./acct-user/abrt/abrt-0-r1.ebuild
 2107101509 ./acct-user/aerospike-amc/aerospike-amc-0.ebuild
 2012281255 ./acct-user/airdcppd/airdcppd-0-r1.ebuild
@@ -856,6 +857,7 @@
 2011290239 ./acct-user/ziproxy/ziproxy-0.ebuild
 2012281255 ./acct-user/znc/znc-0-r1.ebuild
 2107101509 ./acct-user/zookeeper/zookeeper-0.ebuild
+2112071409 ./acct-user/ejabberd/ejabberd-0.ebuild
 2107081639 ./app-accessibility/accerciser/accerciser-3.38.0.ebuild
 2111180910 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
 2107242039 ./app-accessibility/at-spi2-core/at-spi2-core-2.40.2.ebuild
@@ -931,6 +933,7 @@
 2112021139 ./app-admin/awscli/awscli-1.22.18.ebuild
 2112030239 ./app-admin/awscli/awscli-1.22.19.ebuild
 2112040909 ./app-admin/awscli/awscli-1.22.20.ebuild
+2112070240 ./app-admin/awscli/awscli-1.22.21.ebuild
 1912012209 ./app-admin/bastille/bastille-3.0.9-r2.ebuild
 2109201139 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.28.2.ebuild
 2110261109 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.28.3.ebuild
@@ -1279,7 +1282,7 @@
 2111111609 ./app-arch/gnome-autoar/gnome-autoar-0.4.1.ebuild
 2103050309 ./app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
 2104060140 ./app-arch/gzip/gzip-1.10.ebuild
-2112060439 ./app-arch/gzip/gzip-1.11.ebuild
+2112061839 ./app-arch/gzip/gzip-1.11.ebuild
 1906201239 ./app-arch/hardlink/hardlink-0.3.2.ebuild
 2011201939 ./app-arch/innoextract/innoextract-1.9.ebuild
 2106092139 ./app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -1325,7 +1328,7 @@
 1908281239 ./app-arch/qpress/qpress-1.1.ebuild
 2107070309 ./app-arch/rar/rar-6.0.2_p20210611.ebuild
 2107170239 ./app-arch/rpm/rpm-4.16.1.3.ebuild
-2112052209 ./app-arch/rpm/rpm-4.17.0.ebuild
+2112062209 ./app-arch/rpm/rpm-4.17.0.ebuild
 2105111909 ./app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
 2104021709 ./app-arch/rzip/rzip-2.1-r3.ebuild
 2106301339 ./app-arch/sharutils/sharutils-4.15.2-r2.ebuild
@@ -1414,7 +1417,7 @@
 2109162239 ./app-backup/consul-backinator/consul-backinator-1.6.6.ebuild
 1910111840 ./app-backup/cpdup/cpdup-1.18.ebuild
 2107062109 ./app-backup/dar/dar-2.7.1.ebuild
-2112060110 ./app-backup/dar/dar-2.7.2.ebuild
+2112070940 ./app-backup/dar/dar-2.7.2.ebuild
 2109162239 ./app-backup/deja-dup/deja-dup-42.7-r1.ebuild
 2109101039 ./app-backup/deja-dup/deja-dup-42.8.ebuild
 1712281839 ./app-backup/dirvish/dirvish-1.2.1.ebuild
@@ -1446,10 +1449,7 @@
 2011021309 ./app-backup/rsnapshot/rsnapshot-1.4.3.ebuild
 1712281839 ./app-backup/sarab/sarab-1.0.0.ebuild
 1708081203 ./app-backup/simplebackup/simplebackup-1.8.1-r1.ebuild
-2106182240 ./app-backup/snapper/snapper-0.8.15-r2.ebuild
-2106182240 ./app-backup/snapper/snapper-0.8.16-r1.ebuild
-2110121039 ./app-backup/snapper/snapper-0.9.0-r1.ebuild
-2109240909 ./app-backup/snapper/snapper-0.9.1.ebuild
+2112070940 ./app-backup/snapper/snapper-0.9.1.ebuild
 2104031909 ./app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
 2005311609 ./app-backup/synology-cloud-station-backup/synology-cloud-station-backup-4469.ebuild
 2109132339 ./app-backup/tarsnap/tarsnap-1.0.39-r1.ebuild
@@ -1567,8 +1567,6 @@
 1809280333 ./app-crypt/aespipe/aespipe-2.4e.ebuild
 2103110539 ./app-crypt/aespipe/aespipe-2.4f.ebuild
 2109090739 ./app-crypt/age/age-1.0.0.ebuild
-2105291109 ./app-crypt/age/age-1.0.0_rc2.ebuild
-2106152309 ./app-crypt/age/age-1.0.0_rc3.ebuild
 2104060140 ./app-crypt/argon2/argon2-20190702.ebuild
 2103052109 ./app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild
 2006062109 ./app-crypt/asedriveiiie-usb/asedriveiiie-usb-3.5.ebuild
@@ -1681,7 +1679,7 @@
 2101061609 ./app-crypt/libb2/libb2-0.98.1-r3.ebuild
 2109211209 ./app-crypt/libmd/libmd-1.0.3-r2.ebuild
 2107161609 ./app-crypt/libmd/libmd-9999.ebuild
-2112052239 ./app-crypt/libmd/libmd-1.0.4.ebuild
+2112061839 ./app-crypt/libmd/libmd-1.0.4.ebuild
 2103150509 ./app-crypt/libnitrokey/libnitrokey-3.6.ebuild
 2101242039 ./app-crypt/libnitrokey/libnitrokey-9999.ebuild
 2107231409 ./app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1708,7 +1706,7 @@
 2101222209 ./app-crypt/nitrocli/nitrocli-0.3.4.ebuild
 2101291709 ./app-crypt/nitrocli/nitrocli-0.3.5.ebuild
 2106140209 ./app-crypt/nitrocli/nitrocli-0.4.0.ebuild
-2112060110 ./app-crypt/nitrocli/nitrocli-0.4.1.ebuild
+2112070940 ./app-crypt/nitrocli/nitrocli-0.4.1.ebuild
 2101312209 ./app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild
 2008201709 ./app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
 2111051409 ./app-crypt/nwipe/nwipe-0.32.ebuild
@@ -1788,7 +1786,7 @@
 2105010109 ./app-crypt/tc-play/tc-play-2.0-r1.ebuild
 2101201339 ./app-crypt/tpm-emulator/tpm-emulator-0.7.5-r3.ebuild
 2105022009 ./app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
-2105022009 ./app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+2112070940 ./app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
 2109241109 ./app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
 2109280939 ./app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
 2109081009 ./app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
@@ -1797,7 +1795,7 @@
 2105311509 ./app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
 2105161609 ./app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
 2109050109 ./app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
-2107250209 ./app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
+2112070940 ./app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
 2105022009 ./app-crypt/trousers/trousers-0.3.14-r3.ebuild
 2108060339 ./app-crypt/trousers/trousers-0.3.15.ebuild
 2004200009 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2020.02.11.2.ebuild
@@ -3004,6 +3002,7 @@
 2107051709 ./app-emulation/cloud-init/cloud-init-9999.ebuild
 2011072239 ./app-emulation/coldfire/coldfire-0.3.1.ebuild
 2111270009 ./app-emulation/conmon/conmon-2.0.30.ebuild
+2112070710 ./app-emulation/conmon/conmon-2.0.31.ebuild
 2110062109 ./app-emulation/containerd/containerd-1.4.11.ebuild
 2110062109 ./app-emulation/containerd/containerd-1.5.7.ebuild
 2112011609 ./app-emulation/containerd/containerd-1.4.12.ebuild
@@ -3193,20 +3192,20 @@
 2107052310 ./app-emulation/virt-what/virt-what-1.21.ebuild
 2101181209 ./app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild
 2108251939 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.24.ebuild
-2110201439 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
 2111241409 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.30.ebuild
+2112070039 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.28.ebuild
 2108251939 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.24.ebuild
-2110201439 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
 2111241409 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.30.ebuild
+2112070039 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.28.ebuild
 2108251939 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.24.ebuild
-2110201439 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
 2111241409 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.30.ebuild
+2112070039 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.28.ebuild
 2108251939 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.24.ebuild
-2110201439 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
 2111241409 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.30.ebuild
+2112070039 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.28.ebuild
 2111070009 ./app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild
-2111070009 ./app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
 2111241409 ./app-emulation/virtualbox/virtualbox-6.1.30.ebuild
+2112070039 ./app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild
 1812111839 ./app-emulation/vkd3d/vkd3d-1.0.ebuild
 2101170739 ./app-emulation/vkd3d/vkd3d-1.1-r1.ebuild
 1906041809 ./app-emulation/vkd3d/vkd3d-1.1.ebuild
@@ -3290,7 +3289,6 @@
 2105061309 ./app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
 2109021309 ./app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
 2101170739 ./app-eselect/eselect-unison/eselect-unison-0.4.ebuild
-1912200109 ./app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
 2112060110 ./app-eselect/eselect-vdr/eselect-vdr-0.0.4.ebuild
 2109230439 ./app-eselect/eselect-vi/eselect-vi-1.2.ebuild
 2002112051 ./app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
@@ -3434,7 +3432,7 @@
 2108060339 ./app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild
 2107240239 ./app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild
 2104060140 ./app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
-2110311009 ./app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
+2112061439 ./app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
 1712141609 ./app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild
 2011151839 ./app-i18n/mozc/mozc-2.23.2815.102.ebuild
 2105251439 ./app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild
@@ -3624,7 +3622,7 @@
 2107181939 ./app-misc/beanstalkd/beanstalkd-1.10-r1.ebuild
 2112052139 ./app-misc/beanstalkd/beanstalkd-1.12.ebuild
 2006231038 ./app-misc/beep/beep-1.4.9.ebuild
-2112060009 ./app-misc/beep/beep-1.4.9-r1.ebuild
+2112061839 ./app-misc/beep/beep-1.4.9-r1.ebuild
 2104161439 ./app-misc/bfr/bfr-1.6-r3.ebuild
 2103222139 ./app-misc/bgrep/bgrep-0.2_p20210221.ebuild
 1912110241 ./app-misc/bgrep/bgrep-0_p20110121-r1.ebuild
@@ -3937,7 +3935,6 @@
 2103052139 ./app-misc/rox-filer/rox-filer-2.11.ebuild
 2111241610 ./app-misc/rpick/rpick-0.8.6.ebuild
 2004060039 ./app-misc/rtlamr/rtlamr-0.9.1.ebuild
-2104180939 ./app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild
 2111292309 ./app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.11.ebuild
 2107310239 ./app-misc/screen/screen-4.8.0-r3.ebuild
 2107310239 ./app-misc/screen/screen-9999.ebuild
@@ -4033,7 +4030,7 @@
 2104190809 ./app-misc/vzstats/vzstats-0.5.1.ebuild
 2107180039 ./app-misc/wcd/wcd-6.0.2-r1.ebuild
 2110290511 ./app-misc/wcd/wcd-6.0.3-r1.ebuild
-2112050839 ./app-misc/wcd/wcd-6.0.3-r2.ebuild
+2112061839 ./app-misc/wcd/wcd-6.0.3-r2.ebuild
 2102211039 ./app-misc/when/when-1.1.40.ebuild
 2109210039 ./app-misc/wildq/wildq-1.1.10.ebuild
 2103170039 ./app-misc/wipe/wipe-2.3.1.ebuild
@@ -4135,7 +4132,7 @@
 2111070039 ./app-office/texstudio/texstudio-4.0.4.ebuild
 2109280510 ./app-office/texstudio/texstudio-9999.ebuild
 2111221409 ./app-office/texstudio/texstudio-4.1.1.ebuild
-2112052139 ./app-office/texstudio/texstudio-4.0.2.ebuild
+2112061439 ./app-office/texstudio/texstudio-4.0.2.ebuild
 2103071309 ./app-office/unoconv/unoconv-0.9.0.ebuild
 2104101709 ./app-office/upwork/upwork-5.4.5.1-r1.ebuild
 1612040405 ./app-office/worklog-assistant-bin/worklog-assistant-bin-2.1.3580.ebuild
@@ -4145,7 +4142,6 @@
 2111111509 ./app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
 2106101839 ./app-officeext/languagetool/languagetool-5.1.3-r1.ebuild
 2106101839 ./app-officeext/ooo2gd/ooo2gd-3.0.0-r2.ebuild
-2002241609 ./app-officeext/ooofbtools/ooofbtools-2.56.ebuild
 2012172009 ./app-officeext/ooofbtools/ooofbtools-2.57.ebuild
 2105031239 ./app-officeext/ooofbtools/ooofbtools-3.0.ebuild
 2111111509 ./app-officeext/sun-templates/sun-templates-1.0.0-r1.ebuild
@@ -4153,7 +4149,6 @@
 1907181709 ./app-officeext/texmaths/texmaths-0.48.ebuild
 2107170239 ./app-pda/barry/barry-0.18.3.ebuild
 2009160009 ./app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild
-2004261339 ./app-pda/gnupod/gnupod-0.99.8-r2.ebuild
 2108170039 ./app-pda/gtkpod/gtkpod-2.1.5-r3.ebuild
 2110242009 ./app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild
 2012231444 ./app-pda/ifuse/ifuse-1.1.3-r1.ebuild
@@ -4302,7 +4297,7 @@
 1707171556 ./app-shells/ccsh/ccsh-0.0.4-r4.ebuild
 2107102209 ./app-shells/ctypes-sh/ctypes-sh-1.2-r1.ebuild
 2111040039 ./app-shells/dash/dash-0.5.11.3-r1.ebuild
-2112060439 ./app-shells/dash/dash-0.5.11.5.ebuild
+2112061839 ./app-shells/dash/dash-0.5.11.5.ebuild
 2012271709 ./app-shells/dsh/dsh-0.25.10-r1.ebuild
 2104212309 ./app-shells/esh/esh-0.8.5-r2.ebuild
 2107180039 ./app-shells/fish/fish-3.1.2-r1.ebuild
@@ -4485,7 +4480,7 @@
 2108140709 ./app-text/dvipsk/dvipsk-2021.1_p20210325-r1.ebuild
 2101150409 ./app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
 2107210009 ./app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
-2112052209 ./app-text/dvisvgm/dvisvgm-2.12.ebuild
+2112061839 ./app-text/dvisvgm/dvisvgm-2.12.ebuild
 2108180339 ./app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
 2008051739 ./app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild
 2109032109 ./app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
@@ -4510,7 +4505,7 @@
 2101271839 ./app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r5.ebuild
 2110201010 ./app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
 2104010139 ./app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild
-2112060339 ./app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
+2112061839 ./app-text/ghostscript-gpl/ghostscript-gpl-9.55.0-r1.ebuild
 2105251739 ./app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
 2010112239 ./app-text/gocr/gocr-0.50.ebuild
 2105070239 ./app-text/gocr/gocr-0.52.ebuild
@@ -4582,7 +4577,7 @@
 2111140839 ./app-text/libetonyek/libetonyek-9999.ebuild
 2107232139 ./app-text/libexttextcat/libexttextcat-3.4.5.ebuild
 2111181509 ./app-text/libexttextcat/libexttextcat-3.4.6.ebuild
-2109071209 ./app-text/libgepub/libgepub-0.6.0.ebuild
+2112070009 ./app-text/libgepub/libgepub-0.6.0.ebuild
 2108271839 ./app-text/libgxps/libgxps-0.3.2.ebuild
 2012102239 ./app-text/liblangtag/liblangtag-0.6.3.ebuild
 2005091439 ./app-text/libmspub/libmspub-0.1.4.ebuild
@@ -4620,7 +4615,7 @@
 2107180209 ./app-text/msort/msort-8.53.ebuild
 2107180039 ./app-text/multitail/multitail-6.4.2-r1.ebuild
 2110060540 ./app-text/mupdf/mupdf-1.18.0-r4.ebuild
-2112041139 ./app-text/mupdf/mupdf-1.19.0.ebuild
+2112070210 ./app-text/mupdf/mupdf-1.19.0.ebuild
 2102270009 ./app-text/mythes/mythes-1.2.4-r1.ebuild
 2110051709 ./app-text/namazu/namazu-2.0.21.ebuild
 2110051709 ./app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -4676,7 +4671,6 @@
 2106190039 ./app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
 2104060140 ./app-text/poppler-data/poppler-data-0.4.10.ebuild
 2109072039 ./app-text/poppler-data/poppler-data-0.4.11.ebuild
-2107311509 ./app-text/poppler/poppler-21.07.0.ebuild
 2111061809 ./app-text/poppler/poppler-9999.ebuild
 2112042239 ./app-text/poppler/poppler-21.11.0.ebuild
 2108051709 ./app-text/ps2eps/ps2eps-1.68.ebuild
@@ -4728,7 +4722,7 @@
 2109110040 ./app-text/sword-modules/sword-modules-2.5.ebuild
 2109091410 ./app-text/sword/sword-1.9.0-r1.ebuild
 2107270239 ./app-text/t1utils/t1utils-1.41-r2.ebuild
-2112060439 ./app-text/t1utils/t1utils-1.42.ebuild
+2112061839 ./app-text/t1utils/t1utils-1.42.ebuild
 2005171539 ./app-text/tabler/tabler-2-r1.ebuild
 2104192239 ./app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
 2107130309 ./app-text/teckit/teckit-2.5.10.ebuild
@@ -4827,7 +4821,7 @@
 2110170009 ./app-text/zathura/zathura-9999.ebuild
 2108211309 ./app-text/zotero-bin/zotero-bin-5.0.96.3.ebuild
 2112011009 ./app-text/mdbook/mdbook-0.4.14.ebuild
-2112060609 ./app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
+2112070940 ./app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
 2112041339 ./app-text/ronn-ng/ronn-ng-0.9.1.ebuild
 2112051109 ./app-text/ronn-ng/ronn-ng-0.9.1-r1.ebuild
 2106042109 ./app-vim/Vim-Jinja2-Syntax/Vim-Jinja2-Syntax-0.0_pre20210604.ebuild
@@ -4842,6 +4836,7 @@
 2101062209 ./app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
 2105022339 ./app-vim/autoalign/autoalign-14.ebuild
 2105022339 ./app-vim/bash-support/bash-support-4.2.1.ebuild
+2112070609 ./app-vim/bash-support/bash-support-4.3.ebuild
 2004032241 ./app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
 2107082010 ./app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3-r1.ebuild
 2004032241 ./app-vim/breakpts/breakpts-4.0-r1.ebuild
@@ -4935,6 +4930,7 @@
 1712050809 ./app-vim/lightline/lightline-9999.ebuild
 2004032241 ./app-vim/locateopen/locateopen-1.3-r1.ebuild
 1903130139 ./app-vim/lustyexplorer/lustyexplorer-4.3-r1.ebuild
+2112070609 ./app-vim/lustyexplorer/lustyexplorer-5.0.ebuild
 1803110208 ./app-vim/matrix/matrix-1.10-r1.ebuild
 2008240909 ./app-vim/mediawiki/mediawiki-20151115.ebuild
 2105182009 ./app-vim/merginal/merginal-2.1.0.ebuild
@@ -5003,6 +4999,7 @@
 2004032241 ./app-vim/thlnk/thlnk-1.2.1-r1.ebuild
 2105182009 ./app-vim/tlib/tlib-1.22.ebuild
 2108051709 ./app-vim/tlib/tlib-1.23.ebuild
+2112070609 ./app-vim/tlib/tlib-1.27.ebuild
 2004032241 ./app-vim/tmpl/tmpl-0.1-r1.ebuild
 2004032241 ./app-vim/toggle/toggle-0.5-r1.ebuild
 2109171109 ./app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -5238,6 +5235,7 @@
 2111251010 ./dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
 2111281710 ./dev-ada/e3-core/e3-core-22.1.0.ebuild
 2111281710 ./dev-ada/e3-testsuite/e3-testsuite-24.0.ebuild
+2112061609 ./dev-ada/langkit/langkit-22.0.0.ebuild
 2107100039 ./dev-cpp/ETL/ETL-1.4.1.ebuild
 2106172109 ./dev-cpp/abseil-cpp/abseil-cpp-20200225.2-r1.ebuild
 2111161509 ./dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -5252,8 +5250,8 @@
 2101310139 ./dev-cpp/argparse/argparse-2.1.ebuild
 2004032241 ./dev-cpp/asio/asio-1.10.8.ebuild
 2110041409 ./dev-cpp/asio/asio-1.19.2.ebuild
-2110170039 ./dev-cpp/asio/asio-1.20.0.ebuild
 2111061939 ./dev-cpp/asio/asio-1.21.0.ebuild
+2112070940 ./dev-cpp/asio/asio-1.20.0.ebuild
 2108120640 ./dev-cpp/atkmm/atkmm-2.28.2.ebuild
 2106040440 ./dev-cpp/atkmm/atkmm-2.36.1.ebuild
 2109070039 ./dev-cpp/benchmark/benchmark-1.5.6.ebuild
@@ -5288,7 +5286,7 @@
 2111121509 ./dev-cpp/gstreamermm/gstreamermm-1.10.0-r1.ebuild
 2110041109 ./dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
 2110122339 ./dev-cpp/gtest/gtest-9999.ebuild
-2112060339 ./dev-cpp/gtest/gtest-1.11.0.ebuild
+2112070940 ./dev-cpp/gtest/gtest-1.11.0.ebuild
 2102160539 ./dev-cpp/gtkmm/gtkmm-2.24.5-r1.ebuild
 2108120640 ./dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
 2108091509 ./dev-cpp/gtkmm/gtkmm-4.2.0.ebuild
@@ -5432,7 +5430,6 @@
 2110201010 ./dev-db/mongodb/mongodb-4.2.15-r1.ebuild
 2110201010 ./dev-db/mongodb/mongodb-4.4.8-r1.ebuild
 2108280010 ./dev-db/mongodb/mongodb-5.0.2-r1.ebuild
-1702282250 ./dev-db/mtop/mtop-0.6.6-r3.ebuild
 2105231409 ./dev-db/mycli/mycli-1.22.2_p20201026.ebuild
 2109221339 ./dev-db/mycli/mycli-1.24.1.ebuild
 2109221339 ./dev-db/mycli/mycli-9999.ebuild
@@ -5555,8 +5552,8 @@
 2108182309 ./dev-db/postgis/postgis-3.1.2.ebuild
 2108182309 ./dev-db/postgis/postgis-3.1.3.ebuild
 2109302209 ./dev-db/postgis/postgis-3.1.4.ebuild
-2110251839 ./dev-db/postgis/postgis-3.2.0_beta1.ebuild
 2108230109 ./dev-db/postgis/postgis-9999.ebuild
+2112061839 ./dev-db/postgis/postgis-3.2.0_beta3.ebuild
 2111170540 ./dev-db/postgresql/postgresql-10.19.ebuild
 2111170540 ./dev-db/postgresql/postgresql-11.14.ebuild
 2111170540 ./dev-db/postgresql/postgresql-12.9.ebuild
@@ -5616,7 +5613,7 @@
 2109302039 ./dev-db/timescaledb/timescaledb-2.4.2.ebuild
 2111281010 ./dev-db/timescaledb/timescaledb-2.5.0.ebuild
 2111052109 ./dev-db/tinycdb/tinycdb-0.78.ebuild
-2107131439 ./dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
+2112062339 ./dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild
 2104231009 ./dev-db/tora/tora-3.2-r1.ebuild
 2104231009 ./dev-db/tora/tora-9999.ebuild
 2106071139 ./dev-db/unixODBC/unixODBC-2.3.9.ebuild
@@ -5648,7 +5645,7 @@
 2009161739 ./dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
 2111150540 ./dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
 2108081109 ./dev-embedded/esptool/esptool-3.1.ebuild
-2110310609 ./dev-embedded/esptool/esptool-3.2.ebuild
+2112071109 ./dev-embedded/esptool/esptool-3.2.ebuild
 2104180939 ./dev-embedded/freaklabs-boards/freaklabs-boards-1.0.0.ebuild
 2009201709 ./dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
 2105311239 ./dev-embedded/gpsim/gpsim-0.30.0.ebuild
@@ -6711,7 +6708,7 @@
 2101062239 ./dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
 2101062239 ./dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
 2101062239 ./dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
-2104161609 ./dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
+2112071109 ./dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
 2104161439 ./dev-java/ant-core/ant-core-1.10.9.ebuild
 1910161409 ./dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
 1910161409 ./dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
@@ -6987,13 +6984,11 @@
 2111232009 ./dev-java/jnr-a64asm/jnr-a64asm-1.0.0.ebuild
 1707132342 ./dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
 2111250739 ./dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
-1702282250 ./dev-java/jnr-enxio/jnr-enxio-0.7-r1.ebuild
 2111232009 ./dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
 2112021139 ./dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
 2111250739 ./dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
 2111191039 ./dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
 2111262239 ./dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
-1702282250 ./dev-java/jnr-unixsocket/jnr-unixsocket-0.6-r1.ebuild
 2111232009 ./dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
 2111250239 ./dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
 2111250239 ./dev-java/joda-time/joda-time-2.10.10-r1.ebuild
@@ -7056,8 +7051,6 @@
 1702282250 ./dev-java/milton-api/milton-api-2.7.1.3.ebuild
 1702282250 ./dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
 1812150209 ./dev-java/mimepull/mimepull-1.9.6-r2.ebuild
-1910051539 ./dev-java/mina-core/mina-core-1.1.7-r1.ebuild
-2102272239 ./dev-java/mina-core/mina-core-2.0.7-r1.ebuild
 2111250739 ./dev-java/mockito/mockito-1.9.5-r2.ebuild
 1702282250 ./dev-java/mojarra/mojarra-2.2.12-r1.ebuild
 1702282250 ./dev-java/moshi/moshi-1.1.0.ebuild
@@ -7159,7 +7152,6 @@
 2105201339 ./dev-java/sun-jms/sun-jms-1.1-r3.ebuild
 1703270053 ./dev-java/swing-layout/swing-layout-1.0.4-r1.ebuild
 1702282250 ./dev-java/swingx-beaninfo/swingx-beaninfo-1.6.4.ebuild
-1702282250 ./dev-java/swingx-ws/swingx-ws-1.0-r1.ebuild
 2012231444 ./dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
 2105291239 ./dev-java/swingx/swingx-1.6.4-r1.ebuild
 2009200509 ./dev-java/swt/swt-3.7.2-r3.ebuild
@@ -7380,6 +7372,7 @@
 2111300339 ./dev-lang/python/python-3.6.15.ebuild
 2112021839 ./dev-lang/python/python-3.10.0_p1.ebuild
 2112042109 ./dev-lang/python/python-3.9.9.ebuild
+2112071239 ./dev-lang/python/python-3.10.1.ebuild
 2105152009 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.06.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.08.ebuild
@@ -7394,12 +7387,14 @@
 2111030009 ./dev-lang/rust-bin/rust-bin-1.55.0.ebuild
 2111030009 ./dev-lang/rust-bin/rust-bin-1.56.0.ebuild
 2111140209 ./dev-lang/rust-bin/rust-bin-1.56.1.ebuild
+2112070210 ./dev-lang/rust-bin/rust-bin-1.57.0.ebuild
 2111030009 ./dev-lang/rust/rust-1.52.1.ebuild
 2111030009 ./dev-lang/rust/rust-1.53.0.ebuild
 2111030009 ./dev-lang/rust/rust-1.54.0.ebuild
 2111030009 ./dev-lang/rust/rust-1.55.0.ebuild
 2111030009 ./dev-lang/rust/rust-1.56.0-r1.ebuild
 2111130609 ./dev-lang/rust/rust-1.56.1.ebuild
+2112070210 ./dev-lang/rust/rust-1.57.0.ebuild
 2108180339 ./dev-lang/sassc/sassc-3.6.2.ebuild
 2107120939 ./dev-lang/scala-bin/scala-bin-2.13.6.ebuild
 2104161439 ./dev-lang/scala/scala-2.12.10.ebuild
@@ -7513,10 +7508,10 @@
 2107210539 ./dev-libs/bglibs/bglibs-2.04-r2.ebuild
 2110051039 ./dev-libs/bitset/bitset-2.8.4-r3.ebuild
 2105200209 ./dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
-2112052339 ./dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
+2112061839 ./dev-libs/boehm-gc/boehm-gc-8.0.6.ebuild
 1912110241 ./dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
 2107041709 ./dev-libs/boost/boost-1.76.0-r1.ebuild
-2112042239 ./dev-libs/boost/boost-1.77.0-r4.ebuild
+2112061939 ./dev-libs/boost/boost-1.77.0-r4.ebuild
 2107020809 ./dev-libs/botan/botan-2.17.3-r1.ebuild
 2108252339 ./dev-libs/botan/botan-2.18.1-r1.ebuild
 2111201039 ./dev-libs/botan/botan-2.18.2.ebuild
@@ -7627,7 +7622,7 @@
 2111220639 ./dev-libs/gf2x/gf2x-1.3.0.ebuild
 2108051709 ./dev-libs/girara/girara-0.3.5.ebuild
 2108051709 ./dev-libs/girara/girara-9999.ebuild
-2112052139 ./dev-libs/girara/girara-0.3.6.ebuild
+2112061839 ./dev-libs/girara/girara-0.3.6.ebuild
 2011061839 ./dev-libs/gjs/gjs-1.64.4.ebuild
 2106132339 ./dev-libs/gjs/gjs-1.68.1-r1.ebuild
 2108070639 ./dev-libs/gjs/gjs-1.68.2.ebuild
@@ -7889,7 +7884,7 @@
 2104060140 ./dev-libs/liblzw/liblzw-0.2-r1.ebuild
 2102190539 ./dev-libs/liblzw/liblzw-0.3.ebuild
 2109291109 ./dev-libs/libmaa/libmaa-1.3.2.ebuild
-2108020409 ./dev-libs/libmanette/libmanette-0.2.6.ebuild
+2112070009 ./dev-libs/libmanette/libmanette-0.2.6.ebuild
 2111230440 ./dev-libs/libmateweather/libmateweather-1.24.1.ebuild
 2102261839 ./dev-libs/libmaxminddb/libmaxminddb-1.5.2.ebuild
 2107261909 ./dev-libs/libmaxminddb/libmaxminddb-1.6.0.ebuild
@@ -7940,7 +7935,7 @@
 2110180039 ./dev-libs/libpeas/libpeas-1.30.0.ebuild
 2102270409 ./dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
 2104021209 ./dev-libs/libpfm/libpfm-4.11.0.ebuild
-2111280510 ./dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
+2112070009 ./dev-libs/libphonenumber/libphonenumber-8.12.37.ebuild
 2104060140 ./dev-libs/libpipeline/libpipeline-1.5.3.ebuild
 2111090839 ./dev-libs/libpipeline/libpipeline-1.5.4.ebuild
 2103291809 ./dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
@@ -8011,7 +8006,7 @@
 1801051439 ./dev-libs/libtermkey/libtermkey-0.20.ebuild
 2110111709 ./dev-libs/libtermkey/libtermkey-0.22.ebuild
 2105241539 ./dev-libs/libthreadar/libthreadar-1.3.2.ebuild
-2112060110 ./dev-libs/libthreadar/libthreadar-1.3.5.ebuild
+2112070940 ./dev-libs/libthreadar/libthreadar-1.3.5.ebuild
 2111230440 ./dev-libs/libtimezonemap/libtimezonemap-0.4.6-r1.ebuild
 2110202209 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
 1911300139 ./dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
@@ -8054,7 +8049,7 @@
 2104010409 ./dev-libs/libvterm/libvterm-0.1.2.ebuild
 2110111709 ./dev-libs/libvterm/libvterm-0.1.3.ebuild
 2108240140 ./dev-libs/libwacom/libwacom-1.11.ebuild
-2112052139 ./dev-libs/libwacom/libwacom-1.12.ebuild
+2112070539 ./dev-libs/libwacom/libwacom-1.12.ebuild
 2111102109 ./dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
 2102271939 ./dev-libs/libwbxml/libwbxml-0.11.7.ebuild
 2110110009 ./dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -8357,7 +8352,6 @@
 2111060742 ./dev-libs/vala-common/vala-common-0.52.5.ebuild
 2111110139 ./dev-libs/vala-common/vala-common-0.52.7.ebuild
 2111112139 ./dev-libs/vala-common/vala-common-0.54.3.ebuild
-2009131839 ./dev-libs/vc-intrinsics/vc-intrinsics-0_p20200904.ebuild
 2105251739 ./dev-libs/vc/vc-1.4.1-r1.ebuild
 2106231109 ./dev-libs/vc/vc-1.4.2.ebuild
 2109301309 ./dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -8606,7 +8600,7 @@
 2110140009 ./dev-ml/menhir/menhir-20210419-r1.ebuild
 2111072009 ./dev-ml/menhir/menhir-20211012.ebuild
 2110150609 ./dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
-2110150609 ./dev-ml/merlin-extend/merlin-extend-0.6.ebuild
+2112061340 ./dev-ml/merlin-extend/merlin-extend-0.6-r1.ebuild
 2103200439 ./dev-ml/merlin/merlin-3.4.2-r1.ebuild
 2110070939 ./dev-ml/merlin/merlin-4.1-r2.ebuild
 2110152109 ./dev-ml/merlin/merlin-4.2.ebuild
@@ -8806,6 +8800,7 @@
 2112040109 ./dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild
 2112050639 ./dev-ml/ptmap/ptmap-2.0.5-r1.ebuild
 2112050639 ./dev-ml/sedlex/sedlex-2.3-r1.ebuild
+2112061340 ./dev-ml/fix/fix-20211125.ebuild
 2007030339 ./dev-perl/Ace/Ace-1.920.0-r6.ebuild
 2104120442 ./dev-perl/Acme-Damn/Acme-Damn-0.80.0-r2.ebuild
 2101070139 ./dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r2.ebuild
@@ -8816,7 +8811,7 @@
 2008242239 ./dev-perl/Algorithm-Munkres/Algorithm-Munkres-0.80.0-r2.ebuild
 2105061339 ./dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
 2105061339 ./dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild
-2112050639 ./dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild
+2112062309 ./dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild
 2107242339 ./dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild
 2104110109 ./dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.33.0-r1.ebuild
 2110080239 ./dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.34.0.ebuild
@@ -8856,7 +8851,7 @@
 2109222239 ./dev-perl/Archive-Any-Lite/Archive-Any-Lite-0.110.0.ebuild
 2008242239 ./dev-perl/Archive-Any/Archive-Any-0.94.600.ebuild
 2105061309 ./dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
-2112050639 ./dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
+2112061009 ./dev-perl/Archive-Extract/Archive-Extract-0.880.0.ebuild
 2004281709 ./dev-perl/Archive-Tar-Stream/Archive-Tar-Stream-0.30.0-r1.ebuild
 2106152009 ./dev-perl/Archive-Tar-Wrapper/Archive-Tar-Wrapper-0.380.0.ebuild
 2104060140 ./dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
@@ -8943,7 +8938,7 @@
 2008242239 ./dev-perl/CGI-Session/CGI-Session-4.480.0-r3.ebuild
 2008311739 ./dev-perl/CGI-Simple/CGI-Simple-1.250.0.ebuild
 2105042239 ./dev-perl/CGI/CGI-4.510.0.ebuild
-2112050639 ./dev-perl/CGI/CGI-4.530.0.ebuild
+2112061139 ./dev-perl/CGI/CGI-4.530.0.ebuild
 2005071509 ./dev-perl/CHI/CHI-0.600.0-r1.ebuild
 2101070139 ./dev-perl/CPAN-Changes/CPAN-Changes-0.400.2-r1.ebuild
 2110150039 ./dev-perl/CPAN-Checksums/CPAN-Checksums-2.120.0-r1.ebuild
@@ -9000,7 +8995,7 @@
 2110102109 ./dev-perl/Class-DBI/Class-DBI-3.0.17-r3.ebuild
 2110102109 ./dev-perl/Class-Data-Accessor/Class-Data-Accessor-0.40.40-r3.ebuild
 2110092309 ./dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r4.ebuild
-2112050639 ./dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
+2112061009 ./dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.90.0.ebuild
 2012311940 ./dev-perl/Class-Default/Class-Default-1.510.0-r2.ebuild
 2110102109 ./dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0-r1.ebuild
 2110102109 ./dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r3.ebuild
@@ -9027,7 +9022,7 @@
 2110120039 ./dev-perl/Class-Virtual/Class-Virtual-0.80.0-r1.ebuild
 2008251339 ./dev-perl/Class-WhiteHole/Class-WhiteHole-0.40.0-r2.ebuild
 2008242239 ./dev-perl/Class-XPath/Class-XPath-1.400.0-r2.ebuild
-2112060110 ./dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
+2112070940 ./dev-perl/Class-XSAccessor/Class-XSAccessor-1.190.0-r1.ebuild
 2107310939 ./dev-perl/Clipboard/Clipboard-0.280.0.ebuild
 2110121039 ./dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
 2110121039 ./dev-perl/Clone-PP/Clone-PP-1.80.0.ebuild
@@ -9058,14 +9053,14 @@
 2006302009 ./dev-perl/Config-Properties/Config-Properties-1.800.0-r1.ebuild
 2105050009 ./dev-perl/Config-Simple/Config-Simple-4.590.0-r2.ebuild
 2107310939 ./dev-perl/Config-Tiny/Config-Tiny-2.260.0.ebuild
-2112050639 ./dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
+2112061009 ./dev-perl/Config-Tiny/Config-Tiny-2.270.0.ebuild
 2110140239 ./dev-perl/ConfigReader/ConfigReader-0.500.0-r3.ebuild
 2102271939 ./dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
 2012271809 ./dev-perl/Context-Preserve/Context-Preserve-0.30.0.ebuild
 2110140239 ./dev-perl/Contextual-Return/Contextual-Return-0.4.14-r1.ebuild
 2105050009 ./dev-perl/Convert-ASCII-Armour/Convert-ASCII-Armour-1.400.0-r2.ebuild
 2104060140 ./dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
-2112050639 ./dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
+2112061009 ./dev-perl/Convert-ASN1/Convert-ASN1-0.330.0.ebuild
 2105050009 ./dev-perl/Convert-BER/Convert-BER-1.320.0-r2.ebuild
 2009221539 ./dev-perl/Convert-Base32/Convert-Base32-0.60.0.ebuild
 2110140239 ./dev-perl/Convert-BinHex/Convert-BinHex-1.125.0-r1.ebuild
@@ -9080,7 +9075,7 @@
 2105050039 ./dev-perl/Coro/Coro-6.570.0.ebuild
 2105061039 ./dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.240.0.ebuild
 2110200339 ./dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.260.0.ebuild
-2112050639 ./dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
+2112061009 ./dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.270.0.ebuild
 2111210809 ./dev-perl/Crypt-Blowfish/Crypt-Blowfish-2.140.0-r2.ebuild
 2105050039 ./dev-perl/Crypt-CAST5_PP/Crypt-CAST5_PP-1.40.0-r2.ebuild
 2108071809 ./dev-perl/Crypt-CBC/Crypt-CBC-3.30.0.ebuild
@@ -9136,7 +9131,7 @@
 2104130209 ./dev-perl/DBD-MariaDB/DBD-MariaDB-1.210.0-r1.ebuild
 2109130739 ./dev-perl/DBD-Pg/DBD-Pg-3.15.0.ebuild
 2109281609 ./dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
-2112050639 ./dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild
+2112061009 ./dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild
 2107120109 ./dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
 2106070939 ./dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
 2104060140 ./dev-perl/DBI/DBI-1.643.0.ebuild
@@ -9178,7 +9173,7 @@
 2002050409 ./dev-perl/Data-IEEE754/Data-IEEE754-0.20.0.ebuild
 2108031509 ./dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.210.0.ebuild
 2104060140 ./dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
-2112050639 ./dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
+2112061139 ./dev-perl/Data-OptList/Data-OptList-0.112.0.ebuild
 2110172239 ./dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r2.ebuild
 2105150339 ./dev-perl/Data-Page/Data-Page-2.30.0.ebuild
 2110162339 ./dev-perl/Data-Password-passwdqc/Data-Password-passwdqc-0.90.0-r1.ebuild
@@ -9231,7 +9226,7 @@
 2108061539 ./dev-perl/DateTime-Locale/DateTime-Locale-1.320.0.ebuild
 2105240339 ./dev-perl/DateTime-Set/DateTime-Set-0.390.0-r1.ebuild
 2105240339 ./dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.470.0.ebuild
-2112050639 ./dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.500.0.ebuild
+2112061139 ./dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.500.0.ebuild
 2007281509 ./dev-perl/DateTime-Tiny/DateTime-Tiny-1.70.0.ebuild
 2108061539 ./dev-perl/DateTime/DateTime-1.540.0.ebuild
 2007281509 ./dev-perl/DateTimeX-Easy/DateTimeX-Easy-0.89.0-r1.ebuild
@@ -9245,7 +9240,7 @@
 2110212209 ./dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0-r1.ebuild
 2107120109 ./dev-perl/Devel-CheckLib/Devel-CheckLib-1.140.0.ebuild
 2106070939 ./dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
-2112050639 ./dev-perl/Devel-CheckOS/Devel-CheckOS-1.870.0.ebuild
+2112061009 ./dev-perl/Devel-CheckOS/Devel-CheckOS-1.870.0.ebuild
 2007290409 ./dev-perl/Devel-Cover/Devel-Cover-1.360.0.ebuild
 2110160409 ./dev-perl/Devel-Cycle/Devel-Cycle-1.120.0-r1.ebuild
 2007300539 ./dev-perl/Devel-Declare/Devel-Declare-0.6.22.ebuild
@@ -9411,7 +9406,7 @@
 2110280109 ./dev-perl/Festival-Client-Async/Festival-Client-Async-0.30.300-r3.ebuild
 2008211839 ./dev-perl/File-BOM/File-BOM-0.180.0.ebuild
 2107191739 ./dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
-2112050639 ./dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
+2112061009 ./dev-perl/File-BaseDir/File-BaseDir-0.90.0.ebuild
 2110282309 ./dev-perl/File-Copy-Link/File-Copy-Link-0.140.0-r1.ebuild
 2111180209 ./dev-perl/File-Copy-Recursive-Reduced/File-Copy-Recursive-Reduced-0.6.0.ebuild
 2106022009 ./dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
@@ -9893,7 +9888,7 @@
 2107090209 ./dev-perl/MooseX-Types-URI/MooseX-Types-URI-0.90.0.ebuild
 2111190009 ./dev-perl/MooseX-Types/MooseX-Types-0.500.0-r1.ebuild
 2107120009 ./dev-perl/Mouse/Mouse-2.4.10-r1.ebuild
-2112051709 ./dev-perl/Mouse/Mouse-2.5.10.ebuild
+2112070940 ./dev-perl/Mouse/Mouse-2.5.10.ebuild
 2111190439 ./dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r3.ebuild
 2111190439 ./dev-perl/MouseX-Types/MouseX-Types-0.60.0-r2.ebuild
 2111192309 ./dev-perl/Mozilla-CA/Mozilla-CA-20999999-r1.ebuild
@@ -10116,7 +10111,7 @@
 2108010109 ./dev-perl/Proc-Daemon/Proc-Daemon-0.230.0-r1.ebuild
 2108010109 ./dev-perl/Proc-Guard/Proc-Guard-0.70.0-r1.ebuild
 2110110939 ./dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.590.0.ebuild
-2111221539 ./dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.634.0.ebuild
+2112062309 ./dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.634.0.ebuild
 2108010109 ./dev-perl/Proc-Simple/Proc-Simple-1.320.0-r1.ebuild
 2108010109 ./dev-perl/Proc-Wait3/Proc-Wait3-0.50.0-r1.ebuild
 2108010109 ./dev-perl/Proc-WaitStat/Proc-WaitStat-1.0.0-r2.ebuild
@@ -10155,13 +10150,9 @@
 2110290909 ./dev-perl/SOAP-Lite/SOAP-Lite-1.270.0.ebuild
 2105091939 ./dev-perl/SOAP-WSDL/SOAP-WSDL-3.4.0.ebuild
 2105021609 ./dev-perl/SQL-Abstract-Classic/SQL-Abstract-Classic-1.910.0.ebuild
-1912110241 ./dev-perl/SQL-Abstract-Limit/SQL-Abstract-Limit-0.141.0-r1.ebuild
 2108090339 ./dev-perl/SQL-Abstract-Limit/SQL-Abstract-Limit-0.143.0.ebuild
-2012271909 ./dev-perl/SQL-Abstract/SQL-Abstract-1.840.0.ebuild
 2110201239 ./dev-perl/SQL-Abstract/SQL-Abstract-2.0.1.ebuild
-2101070139 ./dev-perl/SQL-Statement/SQL-Statement-1.412.0.ebuild
 2110260639 ./dev-perl/SQL-Statement/SQL-Statement-1.414.0.ebuild
-2007212309 ./dev-perl/SQL-Translator/SQL-Translator-0.110.230.ebuild
 2108090339 ./dev-perl/SQL-Translator/SQL-Translator-1.620.0.ebuild
 2108092339 ./dev-perl/SRU/SRU-1.10.0-r1.ebuild
 2104060140 ./dev-perl/SUPER/SUPER-1.201.411.170.ebuild
@@ -10212,28 +10203,26 @@
 2108090339 ./dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0-r1.ebuild
 2110231909 ./dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0-r1.ebuild
 2111201339 ./dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.160.0.ebuild
+2112061839 ./dev-perl/Spreadsheet-XLSX/Spreadsheet-XLSX-0.170.0.ebuild
 2108092339 ./dev-perl/Starlet/Starlet-0.310.0-r1.ebuild
 2108092339 ./dev-perl/Stat-lsMode/Stat-lsMode-0.500.0-r2.ebuild
 2004141439 ./dev-perl/Statistics-Basic/Statistics-Basic-1.661.100.ebuild
 2108092339 ./dev-perl/Statistics-CaseResampling/Statistics-CaseResampling-0.150.0-r1.ebuild
 2110312109 ./dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild
 2110121039 ./dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.120.0.ebuild
-2004032241 ./dev-perl/Statistics-Descriptive-Discrete/Statistics-Descriptive-Discrete-0.70.0-r1.ebuild
-1912110241 ./dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
 2110170109 ./dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.80.0.ebuild
 2108092339 ./dev-perl/Statistics-Distributions/Statistics-Distributions-1.20.0-r2.ebuild
 2108092339 ./dev-perl/Statistics-TTest/Statistics-TTest-1.1.0-r2.ebuild
 2108092339 ./dev-perl/Stream-Buffered/Stream-Buffered-0.30.0-r1.ebuild
 2108092339 ./dev-perl/String-Approx/String-Approx-3.280.0-r1.ebuild
-2108031909 ./dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
 2110121039 ./dev-perl/String-CRC32/String-CRC32-2.100.0.ebuild
-2108102139 ./dev-perl/String-Ediff/String-Ediff-0.90.0-r2.ebuild
 2110121039 ./dev-perl/String-Ediff/String-Ediff-0.90.0-r3.ebuild
 2108102139 ./dev-perl/String-Errf/String-Errf-0.8.0-r1.ebuild
 2108102139 ./dev-perl/String-Escape/String-Escape-2010.2.0-r2.ebuild
 2108102139 ./dev-perl/String-Flogger/String-Flogger-1.101.245-r1.ebuild
 2108031509 ./dev-perl/String-Format/String-Format-1.180.0.ebuild
 2108102139 ./dev-perl/String-Formatter/String-Formatter-0.102.84-r1.ebuild
+2112061839 ./dev-perl/String-Formatter/String-Formatter-1.234.0.ebuild
 1912110241 ./dev-perl/String-Print/String-Print-0.930.0.ebuild
 2108102139 ./dev-perl/String-Print/String-Print-0.940.0.ebuild
 2106152009 ./dev-perl/String-RewritePrefix/String-RewritePrefix-0.7.0.ebuild
@@ -10268,8 +10257,8 @@
 1912110241 ./dev-perl/Syntax-Highlight-Engine-Simple/Syntax-Highlight-Engine-Simple-0.101.0.ebuild
 2108120039 ./dev-perl/Syntax-Highlight-Engine-Simple/Syntax-Highlight-Engine-Simple-0.102.0.ebuild
 2108120039 ./dev-perl/Syntax-Keyword-Junction/Syntax-Keyword-Junction-0.3.8-r2.ebuild
-2012311940 ./dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
 2012311940 ./dev-perl/Sys-CPU/Sys-CPU-0.610.0.ebuild
+2112071039 ./dev-perl/Sys-CPU/Sys-CPU-0.610.0-r1.ebuild
 1912110241 ./dev-perl/Sys-CpuLoad/Sys-CpuLoad-0.30.0.ebuild
 2110240639 ./dev-perl/Sys-CpuLoad/Sys-CpuLoad-0.310.0-r2.ebuild
 2108120039 ./dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0-r2.ebuild
@@ -10298,7 +10287,7 @@
 1702282250 ./dev-perl/Template-Tiny/Template-Tiny-1.120.0-r1.ebuild
 2110291639 ./dev-perl/Template-Tiny/Template-Tiny-1.140.0.ebuild
 2101081939 ./dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
-2112050709 ./dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
+2112070940 ./dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
 2109171109 ./dev-perl/Template-XML/Template-XML-2.170.0-r2.ebuild
 2108140339 ./dev-perl/Term-ANSIScreen/Term-ANSIScreen-1.500.0-r2.ebuild
 2106160109 ./dev-perl/Term-Encoding/Term-Encoding-0.20.0.ebuild
@@ -10426,7 +10415,7 @@
 1912110241 ./dev-perl/Test-Timer/Test-Timer-2.100.0.ebuild
 2109222239 ./dev-perl/Test-Timer/Test-Timer-2.120.0.ebuild
 2101070139 ./dev-perl/Test-Trap/Test-Trap-0.3.3.ebuild
-2112060609 ./dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
+2112070940 ./dev-perl/Test-Trap/Test-Trap-0.3.4.ebuild
 2109222239 ./dev-perl/Test-Unit-Lite/Test-Unit-Lite-0.120.200-r2.ebuild
 2110032209 ./dev-perl/Test-UseAllModules/Test-UseAllModules-0.170.0-r2.ebuild
 1912110241 ./dev-perl/Test-Version/Test-Version-2.70.0.ebuild
@@ -10455,7 +10444,7 @@
 2110260439 ./dev-perl/Text-BibTeX/Text-BibTeX-0.880.0-r1.ebuild
 2109232339 ./dev-perl/Text-CSV-Simple/Text-CSV-Simple-1.0.0-r2.ebuild
 2105250209 ./dev-perl/Text-CSV/Text-CSV-1.950.0.ebuild
-2110260439 ./dev-perl/Text-CSV/Text-CSV-2.10.0.ebuild
+2112070940 ./dev-perl/Text-CSV/Text-CSV-2.10.0.ebuild
 2107151340 ./dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
 2112060339 ./dev-perl/Text-CSV_XS/Text-CSV_XS-1.460.0.ebuild
 2109232339 ./dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r2.ebuild
@@ -10630,7 +10619,7 @@
 2112050639 ./dev-perl/X11-XCB/X11-XCB-0.190.0.ebuild
 2110040209 ./dev-perl/X500-DN/X500-DN-0.290.0-r2.ebuild
 1806071339 ./dev-perl/XML-Atom/XML-Atom-0.420.0.ebuild
-2110040209 ./dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
+2112061039 ./dev-perl/XML-Atom/XML-Atom-0.430.0.ebuild
 2110040209 ./dev-perl/XML-Catalog/XML-Catalog-1.30.0-r2.ebuild
 2110040209 ./dev-perl/XML-CompactTree-XS/XML-CompactTree-XS-0.30.0-r1.ebuild
 2110040209 ./dev-perl/XML-Compile-Cache/XML-Compile-Cache-1.60.0-r1.ebuild
@@ -11007,7 +10996,7 @@
 2108271709 ./dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
 2111222309 ./dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
 2105012139 ./dev-php/pecl-event/pecl-event-2.5.7.ebuild
-2105012139 ./dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
+2112061439 ./dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
 2012102339 ./dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
 2111222309 ./dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
 2111222339 ./dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
@@ -11286,11 +11275,11 @@
 2106051609 ./dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
 2106221939 ./dev-python/asteval/asteval-0.9.25.ebuild
 2111191009 ./dev-python/astor/astor-0.8.1.ebuild
-2110231639 ./dev-python/astroid/astroid-2.7.3-r1.ebuild
 2111122309 ./dev-python/astroid/astroid-2.8.5.ebuild
 2111212309 ./dev-python/astroid/astroid-2.8.4.ebuild
 2111220139 ./dev-python/astroid/astroid-2.8.6.ebuild
-2111220139 ./dev-python/astroid/astroid-2.9.0.ebuild
+2112071209 ./dev-python/astroid/astroid-2.7.3-r1.ebuild
+2112071209 ./dev-python/astroid/astroid-2.9.0.ebuild
 2107061039 ./dev-python/asttokens/asttokens-2.0.5.ebuild
 2111201839 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2109110839 ./dev-python/async-lru/async-lru-1.0.2_p20201029.ebuild
@@ -11345,6 +11334,7 @@
 2111260211 ./dev-python/black/black-21.10_beta0-r1.ebuild
 2111260211 ./dev-python/black/black-21.11_beta0-r1.ebuild
 2111260211 ./dev-python/black/black-21.9_beta0-r1.ebuild
+2112061009 ./dev-python/black/black-21.12_beta0.ebuild
 2110092239 ./dev-python/bleach/bleach-4.1.0.ebuild
 2109211110 ./dev-python/blessed/blessed-1.19.0.ebuild
 2106051609 ./dev-python/blessings/blessings-1.7-r1.ebuild
@@ -11364,6 +11354,7 @@
 2112021139 ./dev-python/boto3/boto3-1.20.18.ebuild
 2112030239 ./dev-python/boto3/boto3-1.20.19.ebuild
 2112040909 ./dev-python/boto3/boto3-1.20.20.ebuild
+2112070240 ./dev-python/boto3/boto3-1.20.21.ebuild
 2111131309 ./dev-python/botocore/botocore-1.23.5.ebuild
 2111240109 ./dev-python/botocore/botocore-9999.ebuild
 2111270109 ./dev-python/botocore/botocore-1.23.14.ebuild
@@ -11373,6 +11364,7 @@
 2112021139 ./dev-python/botocore/botocore-1.23.18.ebuild
 2112030239 ./dev-python/botocore/botocore-1.23.19.ebuild
 2112040909 ./dev-python/botocore/botocore-1.23.20.ebuild
+2112070240 ./dev-python/botocore/botocore-1.23.21.ebuild
 2107021539 ./dev-python/bottle/bottle-0.12.19.ebuild
 2111200939 ./dev-python/bottleneck/bottleneck-1.3.2-r1.ebuild
 2110291839 ./dev-python/bpython/bpython-0.21.ebuild
@@ -11395,6 +11387,7 @@
 2109231739 ./dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
 2109231739 ./dev-python/catkin_pkg/catkin_pkg-9999.ebuild
 2109181539 ./dev-python/cattrs/cattrs-1.7.1.ebuild
+2112061009 ./dev-python/cattrs/cattrs-1.9.0.ebuild
 2106051639 ./dev-python/cbor/cbor-1.0.0-r1.ebuild
 2111221109 ./dev-python/cbor2/cbor2-5.4.2.ebuild
 2111130709 ./dev-python/cchardet/cchardet-2.1.7.ebuild
@@ -11575,6 +11568,9 @@
 2106030409 ./dev-python/django/django-2.2.24.ebuild
 2107020939 ./dev-python/django/django-3.1.13.ebuild
 2112021209 ./dev-python/django/django-3.2.9.ebuild
+2112071239 ./dev-python/django/django-2.2.25.ebuild
+2112071239 ./dev-python/django/django-3.1.14.ebuild
+2112071239 ./dev-python/django/django-3.2.10.ebuild
 2108292239 ./dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
 2111190139 ./dev-python/django_polymorphic/django_polymorphic-3.1.ebuild
 2107081009 ./dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
@@ -11837,6 +11833,7 @@
 2111241039 ./dev-python/imageio/imageio-2.12.0.ebuild
 2111290709 ./dev-python/imageio/imageio-2.13.0.ebuild
 2112011109 ./dev-python/imageio/imageio-2.13.1.ebuild
+2112071239 ./dev-python/imageio/imageio-2.13.2.ebuild
 2109260039 ./dev-python/imagesize/imagesize-1.2.0.ebuild
 2111101039 ./dev-python/imagesize/imagesize-1.3.0.ebuild
 2106032239 ./dev-python/imapclient/imapclient-2.2.0.ebuild
@@ -11884,8 +11881,8 @@
 2111180910 ./dev-python/isodate/isodate-0.6.0-r2.ebuild
 2111180910 ./dev-python/isoduration/isoduration-20.11.0.ebuild
 2111040010 ./dev-python/isort/isort-5.10.0.ebuild
-2111091344 ./dev-python/isort/isort-5.10.1.ebuild
 2111171109 ./dev-python/isort/isort-5.9.3.ebuild
+2112071209 ./dev-python/isort/isort-5.10.1.ebuild
 2105181609 ./dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
 2106150139 ./dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
 2107081009 ./dev-python/itypes/itypes-1.2.0.ebuild
@@ -12070,9 +12067,11 @@
 2109091909 ./dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
 2110160239 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.0.ebuild
 2111250139 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.3.ebuild
+2112071409 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.ebuild
 2110110009 ./dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
 2111212309 ./dev-python/mkdocs-material/mkdocs-material-7.3.4.ebuild
 2111250139 ./dev-python/mkdocs-material/mkdocs-material-7.3.6.ebuild
+2112071409 ./dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
 2111212209 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
 2111301509 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
 2111121209 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
@@ -12105,8 +12104,8 @@
 2107290309 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2109121909 ./dev-python/munkres/munkres-1.1.4.ebuild
 2104161439 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
-2111171109 ./dev-python/mypy/mypy-0.910-r1.ebuild
-2108101109 ./dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+2112071209 ./dev-python/mypy/mypy-0.910-r1.ebuild
+2112071209 ./dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
 2109080410 ./dev-python/mysql-connector-python/mysql-connector-python-8.0.26.ebuild
 2111140710 ./dev-python/mysql-connector-python/mysql-connector-python-8.0.27.ebuild
 2106290913 ./dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
@@ -12121,7 +12120,7 @@
 2105181609 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
 2105051639 ./dev-python/namespace-zope/namespace-zope-1-r1.ebuild
 2110231639 ./dev-python/natsort/natsort-7.1.1.ebuild
-2111031010 ./dev-python/natsort/natsort-7.2.0.ebuild
+2112071209 ./dev-python/natsort/natsort-7.2.0.ebuild
 2107172139 ./dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
 2110251639 ./dev-python/nbclassic/nbclassic-0.3.3.ebuild
 2111181139 ./dev-python/nbclient/nbclient-0.5.4.ebuild
@@ -12167,6 +12166,7 @@
 2111101039 ./dev-python/nuitka/nuitka-0.6.17.6.ebuild
 2111160210 ./dev-python/nuitka/nuitka-0.6.17.7.ebuild
 2112030239 ./dev-python/nuitka/nuitka-0.6.18.ebuild
+2112070240 ./dev-python/nuitka/nuitka-0.6.18.1.ebuild
 2111150309 ./dev-python/numexpr/numexpr-2.7.3.ebuild
 2112021739 ./dev-python/numexpr/numexpr-2.8.0.ebuild
 2110250009 ./dev-python/numpy/numpy-1.21.1-r1.ebuild
@@ -12267,9 +12267,9 @@
 2112021209 ./dev-python/pikepdf/pikepdf-4.0.2.ebuild
 2106052109 ./dev-python/pilkit/pilkit-2.0.ebuild
 2111140639 ./dev-python/pillow/pillow-8.3.2.ebuild
-2112042239 ./dev-python/pillow/pillow-8.4.0.ebuild
+2112062210 ./dev-python/pillow/pillow-8.4.0.ebuild
 2111281810 ./dev-python/pip/pip-21.3.1.ebuild
-2112010139 ./dev-python/pip/pip-21.3.1-r1.ebuild
+2112071009 ./dev-python/pip/pip-21.3.1-r1.ebuild
 2108181639 ./dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
 2111221709 ./dev-python/pipenv/pipenv-2021.11.9.ebuild
 2105101409 ./dev-python/pivy/pivy-0.6.6.ebuild
@@ -12352,6 +12352,7 @@
 2105141439 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
 2110021339 ./dev-python/pyaes/pyaes-1.6.1-r2.ebuild
 2109101809 ./dev-python/pyalsa/pyalsa-1.1.6-r1.ebuild
+2112071009 ./dev-python/pyalsa/pyalsa-1.2.6.ebuild
 2107271339 ./dev-python/pyamg/pyamg-4.1.0.ebuild
 2105221409 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
 2105221409 ./dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -12392,7 +12393,7 @@
 2109221109 ./dev-python/pydecomp/pydecomp-9999.ebuild
 2111200709 ./dev-python/pydevd/pydevd-2.7.0.ebuild
 2101310343 ./dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
-2110231639 ./dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+2112071209 ./dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
 2112030839 ./dev-python/pydot/pydot-1.4.2-r1.ebuild
 2106052109 ./dev-python/pydotplus/pydotplus-2.0.2.ebuild
 2110311039 ./dev-python/pydyf/pydyf-0.1.2.ebuild
@@ -12445,7 +12446,7 @@
 2111171109 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
 2111261110 ./dev-python/pylama/pylama-8.0.4.ebuild
 2111270109 ./dev-python/pylama/pylama-8.0.6.ebuild
-2112032309 ./dev-python/pylama/pylama-8.3.3.ebuild
+2112071209 ./dev-python/pylama/pylama-8.3.3.ebuild
 2108241740 ./dev-python/pylast/pylast-4.2.1.ebuild
 2111042039 ./dev-python/pylast/pylast-4.3.0.ebuild
 2111302209 ./dev-python/pylast/pylast-4.4.0.ebuild
@@ -12456,7 +12457,7 @@
 2111171109 ./dev-python/pylint/pylint-2.10.2.ebuild
 2111250909 ./dev-python/pylint/pylint-2.11.1.ebuild
 2112031239 ./dev-python/pylint/pylint-2.12.1.ebuild
-2112040909 ./dev-python/pylint/pylint-2.12.2.ebuild
+2112071209 ./dev-python/pylint/pylint-2.12.2.ebuild
 2105281739 ./dev-python/pylru/pylru-1.2.0.ebuild
 2111252209 ./dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
 2101310343 ./dev-python/pymad/pymad-0.10.ebuild
@@ -12739,6 +12740,7 @@
 2110120939 ./dev-python/pyzotero/pyzotero-1.4.26.ebuild
 2101310343 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
 2110201439 ./dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
+2112071409 ./dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
 2111230440 ./dev-python/qrcode/qrcode-7.3.1.ebuild
 2108020609 ./dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
 2110220609 ./dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
@@ -13050,8 +13052,7 @@
 2106192140 ./dev-python/thrift/thrift-0.14.1.ebuild
 2107012209 ./dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
 2107172139 ./dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
-2110011009 ./dev-python/tikzplotlib/tikzplotlib-0.9.13.ebuild
-2110190009 ./dev-python/tikzplotlib/tikzplotlib-0.9.15.ebuild
+2112071339 ./dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild
 2111191509 ./dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
 2106052139 ./dev-python/tinycss/tinycss-0.4.ebuild
 2111230440 ./dev-python/tinycss2/tinycss2-1.1.0.ebuild
@@ -13061,8 +13062,8 @@
 2108220139 ./dev-python/toml/toml-0.10.2.ebuild
 2110111109 ./dev-python/tomli-w/tomli-w-0.3.0.ebuild
 2112010139 ./dev-python/tomli-w/tomli-w-0.4.0.ebuild
-2112021139 ./dev-python/tomli-w/tomli-w-1.0.0.ebuild
-2111262339 ./dev-python/tomli/tomli-1.2.2-r1.ebuild
+2112071009 ./dev-python/tomli-w/tomli-w-1.0.0.ebuild
+2112071409 ./dev-python/tomli/tomli-1.2.2-r1.ebuild
 2106101539 ./dev-python/tomlkit/tomlkit-0.7.2.ebuild
 2111150309 ./dev-python/toolz/toolz-0.11.1.ebuild
 2111140710 ./dev-python/toolz/toolz-0.11.2.ebuild
@@ -13169,6 +13170,7 @@
 2109260039 ./dev-python/webencodings/webencodings-0.5.1-r1.ebuild
 2107290309 ./dev-python/webob/webob-1.8.7.ebuild
 2109130210 ./dev-python/websocket-client/websocket-client-1.2.1.ebuild
+2112071239 ./dev-python/websocket-client/websocket-client-1.2.2.ebuild
 2111151139 ./dev-python/websockets/websockets-10.1.ebuild
 2112040009 ./dev-python/websockets/websockets-10.0.ebuild
 2108260809 ./dev-python/websockify/websockify-0.10.0.ebuild
@@ -13183,7 +13185,7 @@
 2109261009 ./dev-python/whoosh/whoosh-2.7.4-r1.ebuild
 2111181139 ./dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
 2109251639 ./dev-python/wrapt/wrapt-1.12.1.ebuild
-2111100139 ./dev-python/wrapt/wrapt-1.13.2.ebuild
+2112071209 ./dev-python/wrapt/wrapt-1.13.2.ebuild
 2107051639 ./dev-python/ws4py/ws4py-0.5.1-r1.ebuild
 2107051639 ./dev-python/ws4py/ws4py-9999.ebuild
 2106052209 ./dev-python/wsaccel/wsaccel-0.6.3.ebuild
@@ -13211,6 +13213,7 @@
 2108020039 ./dev-python/xxhash/xxhash-2.0.2.ebuild
 2109160309 ./dev-python/yamlpath/yamlpath-3.6.1.ebuild
 2110281739 ./dev-python/yamlpath/yamlpath-3.6.3.ebuild
+2112070240 ./dev-python/yamlpath/yamlpath-3.6.4.ebuild
 2106052209 ./dev-python/yapf/yapf-0.31.0.ebuild
 2111140039 ./dev-python/yappi/yappi-1.3.3.ebuild
 2106052209 ./dev-python/yapsy/yapsy-1.12.2.ebuild
@@ -13247,6 +13250,7 @@
 2111281840 ./dev-python/simpervisor/simpervisor-0.4.ebuild
 2111301139 ./dev-python/boltons/boltons-21.0.0.ebuild
 2112020739 ./dev-python/patatt/patatt-0.4.9.ebuild
+2112071409 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
 2110170339 ./dev-qt/assistant/assistant-5.15.2-r11.ebuild
 2110170339 ./dev-qt/designer/designer-5.15.2-r11.ebuild
 2110170339 ./dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
@@ -14600,6 +14604,7 @@
 2107121639 ./dev-ruby/ansi/ansi-1.5.0-r1.ebuild
 2102160909 ./dev-ruby/arel-helpers/arel-helpers-2.12.0.ebuild
 2108281010 ./dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild
+2112071009 ./dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild
 2101062139 ./dev-ruby/arel/arel-9.0.0.ebuild
 2004122139 ./dev-ruby/ascii85/ascii85-1.0.3.ebuild
 2102061009 ./dev-ruby/ascii85/ascii85-1.1.0.ebuild
@@ -14819,7 +14824,6 @@
 2111252139 ./dev-ruby/execjs/execjs-2.8.1.ebuild
 2009250939 ./dev-ruby/exifr/exifr-1.3.8.ebuild
 2010200809 ./dev-ruby/exifr/exifr-1.3.9.ebuild
-2108131909 ./dev-ruby/facter/facter-3.14.19.ebuild
 2111062109 ./dev-ruby/facter/facter-3.14.20.ebuild
 2112010439 ./dev-ruby/facter/facter-3.14.21.ebuild
 2110091039 ./dev-ruby/fakefs/fakefs-1.3.2.ebuild
@@ -15255,8 +15259,8 @@
 2110110309 ./dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
 2105180909 ./dev-ruby/regexp_parser/regexp_parser-2.1.1.ebuild
 2112051039 ./dev-ruby/regexp_parser/regexp_parser-2.2.0.ebuild
-2110241109 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0-r1.ebuild
-2109080039 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0.ebuild
+2112071009 ./dev-ruby/regexp_property_values/regexp_property_values-1.0.0-r1.ebuild
+2112071009 ./dev-ruby/regexp_property_values/regexp_property_values-1.1.0.ebuild
 2104080909 ./dev-ruby/request_store/request_store-1.5.0.ebuild
 2102221009 ./dev-ruby/rest-client/rest-client-2.1.0.ebuild
 2108030109 ./dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -15284,6 +15288,7 @@
 2108071039 ./dev-ruby/rr/rr-3.0.6.ebuild
 2109080039 ./dev-ruby/rr/rr-3.0.7.ebuild
 2110170909 ./dev-ruby/rr/rr-3.0.8.ebuild
+2112071009 ./dev-ruby/rr/rr-3.0.9.ebuild
 2108030139 ./dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
 2007171039 ./dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
 2108031509 ./dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -15392,12 +15397,9 @@
 2107200839 ./dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
 2111222239 ./dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild
 2101062139 ./dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
-2101062139 ./dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild
-2101171109 ./dev-ruby/ruby_parser/ruby_parser-3.15.1.ebuild
-2106070809 ./dev-ruby/ruby_parser/ruby_parser-3.16.0.ebuild
 2108050839 ./dev-ruby/ruby_parser/ruby_parser-3.17.0.ebuild
 2110290909 ./dev-ruby/ruby_parser/ruby_parser-3.18.0.ebuild
-2111111009 ./dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
+2112070940 ./dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
 2009081509 ./dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
 2107072239 ./dev-ruby/rubygems/rubygems-3.0.3.ebuild
 2102182139 ./dev-ruby/rubygems/rubygems-3.0.9.ebuild
@@ -15451,10 +15453,8 @@
 2110250909 ./dev-ruby/set/set-1.0.2.ebuild
 2111231409 ./dev-ruby/settingslogic/settingslogic-2.0.9-r1.ebuild
 2101062139 ./dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
-2101062139 ./dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
-2101171109 ./dev-ruby/sexp_processor/sexp_processor-4.15.2.ebuild
 2105210839 ./dev-ruby/sexp_processor/sexp_processor-4.15.3.ebuild
-2110290909 ./dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
+2112070940 ./dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
 2105131009 ./dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
 2012202239 ./dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
 2007142009 ./dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
@@ -15799,7 +15799,7 @@
 1911100209 ./dev-tex/latex-calendar/latex-calendar-3.1.ebuild
 2108112240 ./dev-tex/latex2html/latex2html-2021.2.ebuild
 2107030639 ./dev-tex/latex2html/latex2html-2021.ebuild
-2112021239 ./dev-tex/latex2html/latex2html-2021.2-r2.ebuild
+2112071109 ./dev-tex/latex2html/latex2html-2021.2-r2.ebuild
 2012311940 ./dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
 2104290909 ./dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
 2108051709 ./dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -16078,8 +16078,8 @@
 2007061039 ./dev-util/codeblocks/codeblocks-20.03-r1.ebuild
 2103170539 ./dev-util/codeblocks/codeblocks-20.03-r2.ebuild
 2110130039 ./dev-util/codeblocks/codeblocks-20.03-r3.ebuild
-2111021409 ./dev-util/codeblocks/codeblocks-20.03-r4.ebuild
 2004080939 ./dev-util/codeblocks/codeblocks-9999.ebuild
+2112061439 ./dev-util/codeblocks/codeblocks-20.03-r4.ebuild
 2107231009 ./dev-util/codespell/codespell-2.1.0.ebuild
 2104060140 ./dev-util/colm/colm-0.13.0.7.ebuild
 2101191809 ./dev-util/colm/colm-0.14.6.ebuild
@@ -16102,7 +16102,7 @@
 2001272009 ./dev-util/cppi/cppi-1.18.ebuild
 2008292209 ./dev-util/cpptest/cpptest-2.0.0-r1.ebuild
 2105251139 ./dev-util/cppunit/cppunit-1.15.1-r2.ebuild
-2112060009 ./dev-util/cppunit/cppunit-1.15.1-r3.ebuild
+2112061839 ./dev-util/cppunit/cppunit-1.15.1-r3.ebuild
 2111080609 ./dev-util/cpputest/cpputest-4.0.ebuild
 2102161539 ./dev-util/cproto/cproto-4.7r.ebuild
 2104221539 ./dev-util/cproto/cproto-4.7s.ebuild
@@ -16191,6 +16191,7 @@
 2011272109 ./dev-util/difffilter/difffilter-0.3.3-r1.ebuild
 2111130009 ./dev-util/diffoscope/diffoscope-190.ebuild
 2111290409 ./dev-util/diffoscope/diffoscope-194.ebuild
+2112071109 ./dev-util/diffoscope/diffoscope-195.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.63.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.64.ebuild
 2107172140 ./dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -16254,6 +16255,7 @@
 2111290409 ./dev-util/git-delta/git-delta-0.10.2.ebuild
 2112050239 ./dev-util/git-delta/git-delta-0.10.3.ebuild
 2112050609 ./dev-util/git-delta/git-delta-0.9.2.ebuild
+2112071109 ./dev-util/git-delta/git-delta-0.11.1.ebuild
 2108110009 ./dev-util/github-cli/github-cli-1.14.0.ebuild
 2108261940 ./dev-util/github-cli/github-cli-2.0.0.ebuild
 2006130039 ./dev-util/github-cli/github-cli-9999.ebuild
@@ -16311,6 +16313,7 @@
 2101310343 ./dev-util/imediff2/imediff2-1.1.2-r6.ebuild
 2106010939 ./dev-util/imediff2/imediff2-1.1.2.1.ebuild
 2111211309 ./dev-util/include-what-you-use/include-what-you-use-0.16.ebuild
+2112061139 ./dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
 2106301339 ./dev-util/indent/indent-2.2.12.ebuild
 2110300109 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
 2112060110 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9441.ebuild
@@ -16386,9 +16389,9 @@
 2104042139 ./dev-util/makepp/makepp-2.0.99.2.ebuild
 2105161410 ./dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
 2110250139 ./dev-util/maturin/maturin-0.11.5.ebuild
-2111291809 ./dev-util/maturin/maturin-0.12.3.ebuild
 2112011309 ./dev-util/maturin/maturin-0.11.5-r1.ebuild
 2112011309 ./dev-util/maturin/maturin-0.12.3-r1.ebuild
+2112070039 ./dev-util/maturin/maturin-0.12.4.ebuild
 2106171609 ./dev-util/mdds/mdds-1.7.0.ebuild
 2111140839 ./dev-util/mdds/mdds-2.0.0.ebuild
 2111140839 ./dev-util/mdds/mdds-9999.ebuild
@@ -16452,7 +16455,7 @@
 2109270139 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
 2109041839 ./dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
 2109041839 ./dev-util/pkgconf/pkgconf-9999.ebuild
-2112060439 ./dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+2112061839 ./dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
 2110110309 ./dev-util/pkgdev/pkgdev-0.1.9.ebuild
 2108020709 ./dev-util/pkgdev/pkgdev-9999.ebuild
 2008131309 ./dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
@@ -16591,9 +16594,9 @@
 2010101409 ./dev-util/statifier/statifier-1.7.4-r1.ebuild
 2012231444 ./dev-util/stepman/stepman-0.10.5.ebuild
 2110030139 ./dev-util/strace/strace-5.12-r1.ebuild
-2110030139 ./dev-util/strace/strace-5.14-r1.ebuild
 2110030139 ./dev-util/strace/strace-9999.ebuild
 2112020009 ./dev-util/strace/strace-5.15.ebuild
+2112071109 ./dev-util/strace/strace-5.14-r1.ebuild
 1811300009 ./dev-util/stressapptest/stressapptest-1.0.9.ebuild
 2111140039 ./dev-util/stripe-mock/stripe-mock-0.113.0.ebuild
 2111121309 ./dev-util/stripe-mock/stripe-mock-0.114.0.ebuild
@@ -16704,7 +16707,7 @@
 2107172140 ./dev-vcs/git-cola/git-cola-3.8.ebuild
 2107172140 ./dev-vcs/git-cola/git-cola-3.9.ebuild
 2111221709 ./dev-vcs/git-cola/git-cola-3.11.0.ebuild
-2112050839 ./dev-vcs/git-cola/git-cola-3.10.1.ebuild
+2112070940 ./dev-vcs/git-cola/git-cola-3.10.1.ebuild
 2104040109 ./dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
 2103271909 ./dev-vcs/git-extras/git-extras-6.2.0.ebuild
 2110040309 ./dev-vcs/git-extras/git-extras-6.3.0.ebuild
@@ -16726,12 +16729,12 @@
 2106011439 ./dev-vcs/git-tools/git-tools-2020.09.ebuild
 2111140639 ./dev-vcs/git/git-2.32.0-r1.ebuild
 2111082209 ./dev-vcs/git/git-2.33.1.ebuild
-2111152109 ./dev-vcs/git/git-2.34.0.ebuild
-2111082209 ./dev-vcs/git/git-9999-r1.ebuild
-2111082209 ./dev-vcs/git/git-9999-r2.ebuild
-2111082209 ./dev-vcs/git/git-9999-r3.ebuild
-2111082209 ./dev-vcs/git/git-9999.ebuild
 2111251240 ./dev-vcs/git/git-2.34.1.ebuild
+2112061209 ./dev-vcs/git/git-2.34.1-r1.ebuild
+2112061209 ./dev-vcs/git/git-9999-r1.ebuild
+2112061209 ./dev-vcs/git/git-9999-r2.ebuild
+2112061209 ./dev-vcs/git/git-9999-r3.ebuild
+2112061209 ./dev-vcs/git/git-9999.ebuild
 2101310343 ./dev-vcs/gitg/gitg-3.32.1-r1.ebuild
 2107140109 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
 2109020839 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1-r2.ebuild
@@ -17033,7 +17036,7 @@
 2112041709 ./games-board/gnubg/gnubg-1.06.002-r3.ebuild
 2104190739 ./games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
 2107060139 ./games-board/gnuchess/gnuchess-6.2.8-r1.ebuild
-2112060339 ./games-board/gnuchess/gnuchess-6.2.9.ebuild
+2112061839 ./games-board/gnuchess/gnuchess-6.2.9.ebuild
 2109171109 ./games-board/gnugo/gnugo-3.9.1-r2.ebuild
 2010300139 ./games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
 2103160139 ./games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild
@@ -17175,7 +17178,6 @@
 2101252109 ./games-engines/love/love-9999.ebuild
 2104041339 ./games-engines/nazghul/nazghul-0.7.1-r1.ebuild
 2112031609 ./games-engines/odamex/odamex-0.9.5.ebuild
-2108172009 ./games-engines/openmw/openmw-0.46.0-r2.ebuild
 2110170039 ./games-engines/openmw/openmw-9999.ebuild
 2111201609 ./games-engines/openmw/openmw-0.47.0-r1.ebuild
 2102281539 ./games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild
@@ -17284,7 +17286,7 @@
 2106011409 ./games-misc/doge/doge-3.6.0.ebuild
 2104180939 ./games-misc/exult-sound/exult-sound-0-r2.ebuild
 2109291109 ./games-misc/fortune-mod-all/fortune-mod-all-4.ebuild
-2112060609 ./games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
+2112070940 ./games-misc/fortune-mod-all/fortune-mod-all-5.ebuild
 2109291109 ./games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
 2109291109 ./games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2-r1.ebuild
 2109291109 ./games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -17303,7 +17305,7 @@
 2109291109 ./games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
 2109291109 ./games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0-r1.ebuild
 2109291109 ./games-misc/fortune-mod/fortune-mod-1.99.1-r3.ebuild
-2112060609 ./games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
+2112070940 ./games-misc/fortune-mod/fortune-mod-3.6.1-r1.ebuild
 2104041339 ./games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
 2104212209 ./games-misc/funny-manpages/funny-manpages-2.3.ebuild
 2104041339 ./games-misc/gBhed/gBhed-0.17-r1.ebuild
@@ -17406,7 +17408,7 @@
 2106071139 ./games-puzzle/nudoku/nudoku-2.1.0.ebuild
 2107171139 ./games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
 2107171139 ./games-puzzle/numptyphysics/numptyphysics-9999.ebuild
-2111140410 ./games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
+2112070410 ./games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
 2106062109 ./games-puzzle/pauker/pauker-1.8-r2.ebuild
 1908181509 ./games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild
 2107171139 ./games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -17879,6 +17881,7 @@
 1708310022 ./gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
 2006272209 ./gnustep-apps/gspdf/gspdf-0.5.ebuild
 1702282250 ./gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild
+2112061639 ./gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
 2006272209 ./gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
 2006272209 ./gnustep-apps/laternamagica/laternamagica-0.5.ebuild
 2111070139 ./gnustep-apps/mpdcon/mpdcon-1.5.1-r1.ebuild
@@ -17998,7 +18001,7 @@
 2111110109 ./gui-libs/gtk/gtk-4.4.1.ebuild
 2108271839 ./gui-libs/libhandy/libhandy-1.2.3.ebuild
 2109152309 ./gui-libs/libhandy/libhandy-1.4.0.ebuild
-2110310339 ./gui-libs/libwpe/libwpe-1.10.1-r1.ebuild
+2112070009 ./gui-libs/libwpe/libwpe-1.10.1-r1.ebuild
 2107210539 ./gui-libs/neatvnc/neatvnc-0.4.0.ebuild
 2101251809 ./gui-libs/neatvnc/neatvnc-9999.ebuild
 2110260439 ./gui-libs/tepl/tepl-5.0.1-r1.ebuild
@@ -18010,7 +18013,7 @@
 2110310339 ./gui-libs/wlroots/wlroots-0.14.0-r2.ebuild
 2110310339 ./gui-libs/wlroots/wlroots-0.14.1-r1.ebuild
 2111190239 ./gui-libs/wlroots/wlroots-9999.ebuild
-2108020409 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
+2112070009 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.10.0.ebuild
 2111221239 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
 2111221239 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
 2111221239 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
@@ -18227,8 +18230,8 @@
 2111292010 ./kde-apps/kiriki/kiriki-21.11.90.ebuild
 2111290409 ./kde-apps/kiten/kiten-21.08.3.ebuild
 2111292010 ./kde-apps/kiten/kiten-21.11.90.ebuild
-2111280510 ./kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
 2111290409 ./kde-apps/kitinerary/kitinerary-21.08.3.ebuild
+2112070009 ./kde-apps/kitinerary/kitinerary-21.08.3-r1.ebuild
 2111290409 ./kde-apps/kjumpingcube/kjumpingcube-21.08.3.ebuild
 2111292010 ./kde-apps/kjumpingcube/kjumpingcube-21.11.90.ebuild
 2111290409 ./kde-apps/kldap/kldap-21.08.3.ebuild
@@ -18822,10 +18825,10 @@
 2104261339 ./mail-filter/amavisd-milter/amavisd-milter-1.7.0-r1.ebuild
 2104181809 ./mail-filter/amavisd-milter/amavisd-milter-1.7.1.ebuild
 2010160139 ./mail-filter/amavisd-new/amavisd-new-2.12.0-r5.ebuild
-2102050139 ./mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
+2112061439 ./mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
 1911130409 ./mail-filter/bmf/bmf-0.9.4-r3.ebuild
 2107211739 ./mail-filter/bogofilter/bogofilter-1.2.4-r4.ebuild
-2112052209 ./mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
+2112070940 ./mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
 2101310343 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild
 2104031909 ./mail-filter/couriersrs/couriersrs-0.1.2.ebuild
 2101201239 ./mail-filter/dcc/dcc-1.3.158-r1.ebuild
@@ -19071,14 +19074,14 @@
 2105250009 ./media-fonts/jetbrains-mono/jetbrains-mono-2.225.ebuild
 2111100239 ./media-fonts/jetbrains-mono/jetbrains-mono-2.242.ebuild
 2104060140 ./media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
-2111201339 ./media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r3.ebuild
+2112071109 ./media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r3.ebuild
 2103212239 ./media-fonts/jomolhari/jomolhari-0.003c.ebuild
 2108110539 ./media-fonts/joypixels/joypixels-6.5.0-r1.ebuild
 1910192009 ./media-fonts/jsmath-extra-dark/jsmath-extra-dark-1.0.ebuild
 1910192009 ./media-fonts/jsmath/jsmath-1.0.ebuild
 2103212239 ./media-fonts/kacst-fonts/kacst-fonts-2.01.ebuild
 2103212239 ./media-fonts/kanjistrokeorders/kanjistrokeorders-4.002.ebuild
-2112052139 ./media-fonts/kanjistrokeorders/kanjistrokeorders-4.004.ebuild
+2112061839 ./media-fonts/kanjistrokeorders/kanjistrokeorders-4.004.ebuild
 1910192339 ./media-fonts/khmer/khmer-5.0-r1.ebuild
 2104060140 ./media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
 2104060140 ./media-fonts/konfont/konfont-0.1.ebuild
@@ -19155,14 +19158,14 @@
 2104060140 ./media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
 2111251739 ./media-fonts/sil-gentium/sil-gentium-6.001.ebuild
 2104060140 ./media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
-2112060439 ./media-fonts/sil-padauk/sil-padauk-4.000.ebuild
+2112061839 ./media-fonts/sil-padauk/sil-padauk-4.000.ebuild
 1812141339 ./media-fonts/solarize/solarize-0_pre20140818.ebuild
 1812141339 ./media-fonts/solarize/solarize-9999.ebuild
 2103212239 ./media-fonts/sophia-nubian/sophia-nubian-1.0.ebuild
 2110220439 ./media-fonts/source-han-sans/source-han-sans-1.004.ebuild
 2110220439 ./media-fonts/source-pro/source-pro-20170111.ebuild
 2111180910 ./media-fonts/stix-fonts/stix-fonts-1.1.1.ebuild
-2112060009 ./media-fonts/stix-fonts/stix-fonts-2.11.ebuild
+2112062309 ./media-fonts/stix-fonts/stix-fonts-2.11.ebuild
 2111241710 ./media-fonts/takao-fonts/takao-fonts-003.02.01.ebuild
 2111241710 ./media-fonts/takao-fonts/takao-fonts-00303.01.ebuild
 2104060140 ./media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -19292,7 +19295,7 @@
 1708180742 ./media-gfx/gif2apng/gif2apng-1.9-r1.ebuild
 2103070239 ./media-gfx/gif2png/gif2png-2.5.14.ebuild
 2101101639 ./media-gfx/gifsicle/gifsicle-1.92.ebuild
-2112052209 ./media-gfx/gifsicle/gifsicle-1.93.ebuild
+2112070940 ./media-gfx/gifsicle/gifsicle-1.93.ebuild
 1904252009 ./media-gfx/gimp-arrow-brushes/gimp-arrow-brushes-20190407.ebuild
 2110092309 ./media-gfx/gimp/gimp-2.10.22-r3.ebuild
 2110092309 ./media-gfx/gimp/gimp-2.10.24-r1.ebuild
@@ -19357,7 +19360,7 @@
 2010292239 ./media-gfx/iscan-plugin-network-nt/iscan-plugin-network-nt-1.1.3.ebuild
 2101152339 ./media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
 2011051139 ./media-gfx/iscan/iscan-3.63.0.ebuild
-2102031439 ./media-gfx/iscan/iscan-3.65.0.ebuild
+2112061109 ./media-gfx/iscan/iscan-3.65.0.ebuild
 2007182209 ./media-gfx/jhead/jhead-3.04.ebuild
 1902162309 ./media-gfx/jigl/jigl-2.0.1-r1.ebuild
 2101061739 ./media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
@@ -19391,7 +19394,7 @@
 2101310343 ./media-gfx/mcomix/mcomix-9999.ebuild
 2106032239 ./media-gfx/meshlab/meshlab-2020.12-r1.ebuild
 1806091709 ./media-gfx/metapixel/metapixel-1.0.2-r1.ebuild
-2111201339 ./media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
+2112070539 ./media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
 1902221509 ./media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
 2006222338 ./media-gfx/monica/monica-3.7.ebuild
 2105292209 ./media-gfx/mscgen/mscgen-0.20.ebuild
@@ -19439,7 +19442,7 @@
 1912131839 ./media-gfx/pngtools/pngtools-0.4-r2.ebuild
 2004282239 ./media-gfx/potrace/potrace-1.15.ebuild
 2106250439 ./media-gfx/potrace/potrace-1.16.ebuild
-2107220339 ./media-gfx/povray/povray-3.7.0.0-r1.ebuild
+2112061539 ./media-gfx/povray/povray-3.7.0.0-r1.ebuild
 2110190339 ./media-gfx/pqiv/pqiv-2.11.ebuild
 2004261109 ./media-gfx/pqiv/pqiv-9999.ebuild
 1805290208 ./media-gfx/pqstego/pqstego-0.0.1.ebuild
@@ -19529,11 +19532,13 @@
 2107200239 ./media-libs/allegro/allegro-5.2.7.0.ebuild
 2109230439 ./media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
 2110030209 ./media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
+2112071009 ./media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
 2106052339 ./media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
 2109230439 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
 2110030209 ./media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.1.ebuild
 2109230439 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
 2110030209 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.1.ebuild
+2112071009 ./media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.6.ebuild
 2101070439 ./media-libs/alure/alure-1.2-r2.ebuild
 2109230909 ./media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
 2108211209 ./media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -19660,10 +19665,8 @@
 1911130409 ./media-libs/guilib/guilib-1.2.1-r1.ebuild
 1707291534 ./media-libs/gupnp-dlna/gupnp-dlna-0.10.5.ebuild
 2108291210 ./media-libs/gupnp-dlna/gupnp-dlna-0.11.0.ebuild
-2108051739 ./media-libs/hamlib/hamlib-4.2.ebuild
 2112041139 ./media-libs/hamlib/hamlib-4.3.1.ebuild
 2112041139 ./media-libs/hamlib/hamlib-4.4.ebuild
-2109302139 ./media-libs/harfbuzz/harfbuzz-2.9.1.ebuild
 2111042039 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
 2111262210 ./media-libs/harfbuzz/harfbuzz-3.1.2.ebuild
 2112042239 ./media-libs/harfbuzz/harfbuzz-3.1.1.ebuild
@@ -19703,7 +19706,7 @@
 2104051839 ./media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
 2104051839 ./media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
 2105222139 ./media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
-2112060110 ./media-libs/lib3mf/lib3mf-2.2.0.ebuild
+2112061439 ./media-libs/lib3mf/lib3mf-2.2.0.ebuild
 2103100209 ./media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
 2108211209 ./media-libs/libaacs/libaacs-0.11.0.ebuild
 2110170109 ./media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -19940,8 +19943,8 @@
 2108250009 ./media-libs/lilv/lilv-0.24.12.ebuild
 2101060939 ./media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
 2102042339 ./media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
-2107130309 ./media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
 2102061339 ./media-libs/lsp-plugins/lsp-plugins-9999.ebuild
+2112061809 ./media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
 2108250009 ./media-libs/lv2/lv2-1.18.2.ebuild
 2009231339 ./media-libs/lvtk/lvtk-1.2.0-r1.ebuild
 2111180910 ./media-libs/mesa/mesa-21.2.5.ebuild
@@ -20022,7 +20025,6 @@
 2104250839 ./media-libs/qtav/qtav-1.12.0-r3.ebuild
 2104111439 ./media-libs/quarter/quarter-1.1.0.ebuild
 2110170109 ./media-libs/quesoglc/quesoglc-0.7.2-r1.ebuild
-2103222339 ./media-libs/quvi/quvi-0.9.5.ebuild
 2108060339 ./media-libs/raptor/raptor-2.0.15-r4.ebuild
 2104021709 ./media-libs/raspberrypi-userland-bin/raspberrypi-userland-bin-1.20201201.ebuild
 2102162239 ./media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -20030,11 +20032,11 @@
 2011230809 ./media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
 2104252239 ./media-libs/resid/resid-0.16_p2-r1.ebuild
 2107280609 ./media-libs/rlottie/rlottie-0.2_p20210405.ebuild
-2111121239 ./media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
+2112070339 ./media-libs/rnnoise/rnnoise-0.4.1_p20210122.ebuild
 2003191509 ./media-libs/rtaudio/rtaudio-5.1.0.ebuild
 2111171239 ./media-libs/rtaudio/rtaudio-5.2.0.ebuild
 2108241740 ./media-libs/rubberband/rubberband-1.9.2.ebuild
-2111250310 ./media-libs/rubberband/rubberband-2.0.0.ebuild
+2112070410 ./media-libs/rubberband/rubberband-2.0.0.ebuild
 2108210139 ./media-libs/sbc/sbc-1.5.ebuild
 2108250339 ./media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
 2108211209 ./media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -20133,6 +20135,7 @@
 2111140109 ./media-libs/zxing-cpp/zxing-cpp-1.2.0.ebuild
 2108102139 ./media-plugins/alsa-plugins/alsa-plugins-1.2.2.ebuild
 2108102139 ./media-plugins/alsa-plugins/alsa-plugins-1.2.5.ebuild
+2112071009 ./media-plugins/alsa-plugins/alsa-plugins-1.2.6.ebuild
 1908030939 ./media-plugins/alsaequal/alsaequal-0.7.1.ebuild
 2110221139 ./media-plugins/amb-plugins/amb-plugins-0.8.1-r1.ebuild
 2101310343 ./media-plugins/ams-lv2/ams-lv2-1.2.2.ebuild
@@ -20596,7 +20599,7 @@
 2105091239 ./media-plugins/vdr-osdteletext/vdr-osdteletext-0.9.8.ebuild
 2107171739 ./media-plugins/vdr-osdteletext/vdr-osdteletext-1.1.1.ebuild
 2108111010 ./media-plugins/vdr-osdteletext/vdr-osdteletext-2.1.1.ebuild
-2108160939 ./media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
+2112071109 ./media-plugins/vdr-osdteletext/vdr-osdteletext-2.2.1.ebuild
 2108181339 ./media-plugins/vdr-peer/vdr-peer-0.0.1.ebuild
 2006041239 ./media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
 2006041239 ./media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
@@ -20712,12 +20715,14 @@
 2108190439 ./media-sound/abcm2ps/abcm2ps-8.14.12.ebuild
 2111180209 ./media-sound/abcmidi/abcmidi-2021.10.15.ebuild
 2111261240 ./media-sound/abcmidi/abcmidi-2021.11.25.ebuild
+2112061309 ./media-sound/abcmidi/abcmidi-2021.12.05.ebuild
 2008111739 ./media-sound/aeolus/aeolus-0.9.9.ebuild
 1703112346 ./media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
 2106052339 ./media-sound/alsa-tools/alsa-tools-1.2.2-r1.ebuild
 2109101809 ./media-sound/alsa-tools/alsa-tools-1.2.5.ebuild
 2109230439 ./media-sound/alsa-utils/alsa-utils-1.2.4.ebuild
 2107021539 ./media-sound/alsa-utils/alsa-utils-1.2.5.1.ebuild
+2112071009 ./media-sound/alsa-utils/alsa-utils-1.2.6.ebuild
 1806121839 ./media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
 2012270139 ./media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
 2109041339 ./media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
@@ -20799,7 +20804,7 @@
 2012292009 ./media-sound/dvda-author/dvda-author-10.06-r1.ebuild
 2108090439 ./media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
 2111121239 ./media-sound/easyeffects/easyeffects-6.1.4.ebuild
-2111182039 ./media-sound/easyeffects/easyeffects-6.1.5.ebuild
+2112070339 ./media-sound/easyeffects/easyeffects-6.1.5.ebuild
 2109280109 ./media-sound/easytag/easytag-2.4.3-r2.ebuild
 2109190909 ./media-sound/ecasound/ecasound-2.9.3.ebuild
 2111290409 ./media-sound/elisa/elisa-21.08.3.ebuild
@@ -20855,8 +20860,9 @@
 2108170039 ./media-sound/herrie/herrie-2.2-r2.ebuild
 2104130339 ./media-sound/horgand/horgand-1.14-r2.ebuild
 2110241009 ./media-sound/hydrogen/hydrogen-1.0.2.ebuild
-2110170139 ./media-sound/hydrogen/hydrogen-1.1.0.ebuild
-2109072209 ./media-sound/hydrogen/hydrogen-9999.ebuild
+2112061439 ./media-sound/hydrogen/hydrogen-1.1.0.ebuild
+2112061439 ./media-sound/hydrogen/hydrogen-1.1.1.ebuild
+2112061439 ./media-sound/hydrogen/hydrogen-9999.ebuild
 1910161509 ./media-sound/icecream/icecream-1.3.ebuild
 2109270139 ./media-sound/id3/id3-0.15-r1.ebuild
 1912111539 ./media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -20977,7 +20983,7 @@
 2105010009 ./media-sound/patchage/patchage-1.0.4.ebuild
 2108210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
 2102251039 ./media-sound/pavucontrol/pavucontrol-4.0.ebuild
-2111011310 ./media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+2112070009 ./media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
 2011141839 ./media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
 1912111539 ./media-sound/peercast/peercast-0.1218-r2.ebuild
 2006091709 ./media-sound/pianobar/pianobar-2020.04.05.ebuild
@@ -21020,8 +21026,8 @@
 2108012139 ./media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
 2108190439 ./media-sound/qmmp/qmmp-1.5.1.ebuild
 2106091639 ./media-sound/qmmp/qmmp-9999.ebuild
-2108071809 ./media-sound/qsampler/qsampler-0.9.4.ebuild
-2102151209 ./media-sound/qsampler/qsampler-9999.ebuild
+2112061309 ./media-sound/qsampler/qsampler-0.9.4.ebuild
+2112061309 ./media-sound/qsampler/qsampler-9999.ebuild
 2108080310 ./media-sound/qsynth/qsynth-0.9.4.ebuild
 2102071739 ./media-sound/qsynth/qsynth-9999.ebuild
 2005210139 ./media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
@@ -21211,12 +21217,10 @@
 1912131639 ./media-video/chaplin/chaplin-1.10-r2.ebuild
 2111060742 ./media-video/cheese/cheese-3.38.0-r1.ebuild
 2104241239 ./media-video/cheese/cheese-3.38.0.ebuild
-1912110241 ./media-video/clive/clive-2.3.0.1.ebuild
 2104161439 ./media-video/cpvts/cpvts-1.2-r1.ebuild
 2101310343 ./media-video/devedeng/devedeng-4.16.0-r1.ebuild
 2111292209 ./media-video/dirac/dirac-1.0.2-r1.ebuild
-2110061639 ./media-video/droidcam/droidcam-1.8.0-r1.ebuild
-2107301139 ./media-video/droidcam/droidcam-1.8.0.ebuild
+2112071310 ./media-video/droidcam/droidcam-1.8.1.ebuild
 2004261409 ./media-video/dv2sub/dv2sub-0.3-r1.ebuild
 1807262239 ./media-video/dvbackup/dvbackup-0.0.4-r2.ebuild
 2110221139 ./media-video/dvbsnoop/dvbsnoop-1.4.50-r2.ebuild
@@ -21797,12 +21801,10 @@
 2110021209 ./net-analyzer/wapiti/wapiti-3.0.5.ebuild
 2110021209 ./net-analyzer/wapiti/wapiti-9999.ebuild
 2001301739 ./net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild
-2108140709 ./net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
-2110170109 ./net-analyzer/wireshark/wireshark-3.4.8.ebuild
 2111181209 ./net-analyzer/wireshark/wireshark-3.4.9.ebuild
-2111240610 ./net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
-2111240610 ./net-analyzer/wireshark/wireshark-9999.ebuild
 2112040439 ./net-analyzer/wireshark/wireshark-3.4.10.ebuild
+2112071040 ./net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+2112070540 ./net-analyzer/wireshark/wireshark-9999.ebuild
 2103160309 ./net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
 2011270309 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
 2011271109 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
@@ -21817,6 +21819,7 @@
 2110100539 ./net-analyzer/zmap/zmap-2.1.1-r3.ebuild
 2010021709 ./net-analyzer/zmap/zmap-9999.ebuild
 2110212239 ./net-analyzer/zniper/zniper-1.0-r3.ebuild
+2112071009 ./net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
 2105171209 ./net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild
 2105171209 ./net-dialup/accel-ppp/accel-ppp-9999.ebuild
 2008170839 ./net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
@@ -21843,7 +21846,7 @@
 1912261539 ./net-dialup/picocom/picocom-3.1.ebuild
 2106122209 ./net-dialup/ppp-scripts/ppp-scripts-0.ebuild
 2107131239 ./net-dialup/ppp/ppp-2.4.9-r4.ebuild
-2112060439 ./net-dialup/ppp/ppp-2.4.9-r5.ebuild
+2112061840 ./net-dialup/ppp/ppp-2.4.9-r5.ebuild
 2111252140 ./net-dialup/pppconfig/pppconfig-2.3.25.ebuild
 2111292209 ./net-dialup/pppconfig/pppconfig-2.3.21.ebuild
 2107250209 ./net-dialup/pptpclient/pptpclient-1.10.0.ebuild
@@ -21851,7 +21854,7 @@
 1804021338 ./net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
 2109030510 ./net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
 2112020039 ./net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild
-2112060439 ./net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
+2112061840 ./net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
 2104172239 ./net-dialup/sendpage/sendpage-1.1.0-r4.ebuild
 2104161439 ./net-dialup/sercd/sercd-3.0.0-r2.ebuild
 2104161439 ./net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild
@@ -21919,7 +21922,7 @@
 2110122309 ./net-dns/nsd/nsd-4.3.7.ebuild
 2110122309 ./net-dns/nsd/nsd-4.3.8.ebuild
 1912111540 ./net-dns/odsclient/odsclient-1.03-r1.ebuild
-2111280510 ./net-dns/opendnssec/opendnssec-2.1.10.ebuild
+2112071310 ./net-dns/opendnssec/opendnssec-2.1.10-r1.ebuild
 2108201239 ./net-dns/openresolv/openresolv-3.12.0.ebuild
 2109240909 ./net-dns/pdns-recursor/pdns-recursor-4.4.5.ebuild
 2110082240 ./net-dns/pdns-recursor/pdns-recursor-4.4.6.ebuild
@@ -21966,7 +21969,7 @@
 2107310240 ./net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
 1902190039 ./net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild
 2108231509 ./net-firewall/ipset/ipset-7.11-r1.ebuild
-2112052209 ./net-firewall/ipset/ipset-7.15.ebuild
+2112070940 ./net-firewall/ipset/ipset-7.15.ebuild
 2107051739 ./net-firewall/ipt_netflow/ipt_netflow-2.6.ebuild
 2103100439 ./net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
 2109030510 ./net-firewall/iptables/iptables-1.8.7.ebuild
@@ -22076,6 +22079,7 @@
 2112012139 ./net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
 2107310240 ./net-im/ejabberd/ejabberd-20.04.ebuild
 2107310240 ./net-im/ejabberd/ejabberd-21.04.ebuild
+2112071409 ./net-im/ejabberd/ejabberd-21.04-r1.ebuild
 2107180040 ./net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
 2107180040 ./net-im/ekg2/ekg2-9999.ebuild
 2112010609 ./net-im/element-desktop-bin/element-desktop-bin-1.9.5.ebuild
@@ -22115,7 +22119,7 @@
 2111252340 ./net-im/qtox/qtox-1.17.3.ebuild
 2107160109 ./net-im/ricochet/ricochet-1.1.4.ebuild
 2007281739 ./net-im/ricochet/ricochet-9999.ebuild
-2111250140 ./net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.6.0.ebuild
+2112071310 ./net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.0.ebuild
 2111141410 ./net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
 2111161940 ./net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
 2111020109 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
@@ -22236,7 +22240,7 @@
 2009050539 ./net-libs/biblesync/biblesync-2.1.0.ebuild
 2108291210 ./net-libs/c-client/c-client-2007f-r7.ebuild
 2002092209 ./net-libs/canlock/canlock-2b.ebuild
-2112052209 ./net-libs/canlock/canlock-3.2.2.ebuild
+2112070940 ./net-libs/canlock/canlock-3.2.2.ebuild
 2108160539 ./net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild
 2108160539 ./net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild
 2108160539 ./net-libs/courier-authlib/courier-authlib-0.71.0-r3.ebuild
@@ -22250,7 +22254,7 @@
 2011291139 ./net-libs/cppzmq/cppzmq-4.6.0.ebuild
 2106302209 ./net-libs/cvm/cvm-0.97-r1.ebuild
 2105160309 ./net-libs/czmq/czmq-4.2.0.ebuild
-2110151339 ./net-libs/czmq/czmq-4.2.1.ebuild
+2112070940 ./net-libs/czmq/czmq-4.2.1.ebuild
 2104040939 ./net-libs/daq/daq-2.0.7.ebuild
 2105012139 ./net-libs/davix/davix-0.7.6.ebuild
 2108291210 ./net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.4.0.ebuild
@@ -22358,7 +22362,7 @@
 2111290409 ./net-libs/libktorrent/libktorrent-21.08.3.ebuild
 2111292010 ./net-libs/libktorrent/libktorrent-21.11.90.ebuild
 2104060140 ./net-libs/liblockfile/liblockfile-1.16.ebuild
-2112052239 ./net-libs/liblockfile/liblockfile-1.17.ebuild
+2112070940 ./net-libs/liblockfile/liblockfile-1.17.ebuild
 2111081109 ./net-libs/libmbim/libmbim-1.24.8.ebuild
 2111081109 ./net-libs/libmbim/libmbim-1.26.0.ebuild
 2109141739 ./net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
@@ -22566,8 +22570,8 @@
 2011041709 ./net-libs/usrsctp/usrsctp-0.9.3.0_p20201102.ebuild
 2106120439 ./net-libs/usrsctp/usrsctp-0.9.5.0.ebuild
 2102270739 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
-2110070239 ./net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
 2111080239 ./net-libs/webkit-gtk/webkit-gtk-2.34.1-r1.ebuild
+2112070009 ./net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
 2106222139 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild
 2106222139 ./net-libs/wvstreams/wvstreams-99999.ebuild
 2110291539 ./net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
@@ -22587,7 +22591,7 @@
 2108061839 ./net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
 2111260110 ./net-mail/asmail/asmail-2.1-r2.ebuild
 2106130709 ./net-mail/automx2/automx2-2021.4.ebuild
-2110200610 ./net-mail/automx2/automx2-2021.5.ebuild
+2112061039 ./net-mail/automx2/automx2-2021.5.ebuild
 2104060140 ./net-mail/autorespond/autorespond-2.0.4.ebuild
 2007210509 ./net-mail/autorespond/autorespond-2.0.5.ebuild
 2112020739 ./net-mail/b4/b4-0.8.0.ebuild
@@ -22628,8 +22632,8 @@
 2109081439 ./net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
 2111060309 ./net-mail/imapsync/imapsync-1.977.ebuild
 2106081009 ./net-mail/isync/isync-1.3.6.ebuild
-2106071909 ./net-mail/isync/isync-1.4.2.ebuild
 2105272009 ./net-mail/isync/isync-9999.ebuild
+2112070940 ./net-mail/isync/isync-1.4.4.ebuild
 2012201939 ./net-mail/lbdb/lbdb-0.47.ebuild
 2104040109 ./net-mail/libdbx/libdbx-1.0.3.ebuild
 2107251209 ./net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
@@ -23009,10 +23013,10 @@
 2007201209 ./net-misc/netsed/netsed-1.3.ebuild
 2104040109 ./net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
 2111060742 ./net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
-2110280639 ./net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
 2109252239 ./net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild
 2109252239 ./net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild
-2112052139 ./net-misc/networkmanager/networkmanager-1.32.12.ebuild
+2112070339 ./net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+2112070940 ./net-misc/networkmanager/networkmanager-1.32.12.ebuild
 2105271339 ./net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
 2107072240 ./net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
 2109290039 ./net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
@@ -23155,7 +23159,7 @@
 2105010239 ./net-misc/socat/socat-1.7.3.4.ebuild
 2107021539 ./net-misc/socat/socat-1.7.4.1.ebuild
 2105010239 ./net-misc/socat/socat-2.0.0_beta9.ebuild
-2112052339 ./net-misc/socat/socat-1.7.4.2.ebuild
+2112061840 ./net-misc/socat/socat-1.7.4.2.ebuild
 2002230040 ./net-misc/sock/sock-1.1-r1.ebuild
 2108292239 ./net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild
 2103310109 ./net-misc/socket/socket-1.5.ebuild
@@ -23205,6 +23209,7 @@
 1911091639 ./net-misc/tiers/tiers-1.1.ebuild
 2109170539 ./net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
 2109130039 ./net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+2112070310 ./net-misc/tigervnc/tigervnc-9999.ebuild
 2104200439 ./net-misc/tipcutils/tipcutils-2.0.3.ebuild
 1706022014 ./net-misc/ttytter/ttytter-2.1.00.ebuild
 2103012009 ./net-misc/turbovnc/turbovnc-2.2.6.ebuild
@@ -23266,7 +23271,7 @@
 2108080009 ./net-misc/youtube-viewer/youtube-viewer-9999.ebuild
 2110290239 ./net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
 2111221939 ./net-misc/yt-dlp/yt-dlp-2021.11.10.1-r1.ebuild
-2112010409 ./net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild
+2112070040 ./net-misc/yt-dlp/yt-dlp-2021.12.1-r1.ebuild
 2104122209 ./net-misc/zerotier/zerotier-1.6.3.ebuild
 2104122209 ./net-misc/zerotier/zerotier-1.6.4.ebuild
 2110271609 ./net-misc/zssh/zssh-1.5c-r1.ebuild
@@ -23395,8 +23400,8 @@
 2111192109 ./net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild
 2104180939 ./net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
 2108070909 ./net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
-2110311139 ./net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
 2108070909 ./net-p2p/retroshare/retroshare-0.6.6.ebuild
+2112071110 ./net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
 2101061839 ./net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
 2101061839 ./net-p2p/rtorrent/rtorrent-0.9.7.ebuild
 2101112239 ./net-p2p/rtorrent/rtorrent-0.9.8.ebuild
@@ -23477,8 +23482,6 @@
 2107211639 ./net-proxy/haproxy/haproxy-2.0.9999.ebuild
 2111111809 ./net-proxy/haproxy/haproxy-2.2.18.ebuild
 2107211639 ./net-proxy/haproxy/haproxy-2.2.9999.ebuild
-2110081740 ./net-proxy/haproxy/haproxy-2.4.7.ebuild
-2111111809 ./net-proxy/haproxy/haproxy-2.4.8.ebuild
 2107211639 ./net-proxy/haproxy/haproxy-2.4.9999.ebuild
 2111201339 ./net-proxy/haproxy/haproxy-2.0.25.ebuild
 2111201339 ./net-proxy/haproxy/haproxy-2.2.17.ebuild
@@ -23486,6 +23489,7 @@
 2111241440 ./net-proxy/haproxy/haproxy-2.4.9.ebuild
 2111241440 ./net-proxy/haproxy/haproxy-2.5.0.ebuild
 2111241440 ./net-proxy/haproxy/haproxy-2.5.9999.ebuild
+2112071110 ./net-proxy/haproxy/haproxy-2.0.26.ebuild
 2101310343 ./net-proxy/hatop/hatop-0.8.0.ebuild
 2111251340 ./net-proxy/hatop/hatop-0.8.1.ebuild
 2104172239 ./net-proxy/havp/havp-0.92a-r3.ebuild
@@ -23782,12 +23786,8 @@
 2002110109 ./perl-core/Module-CoreList/Module-CoreList-5.201.806.260.ebuild
 2104242039 ./perl-core/Module-Load/Module-Load-0.360.0.ebuild
 2111042109 ./perl-core/Module-Loaded/Module-Loaded-0.80.0-r2.ebuild
-1706160332 ./perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
 2101061839 ./perl-core/Params-Check/Params-Check-0.380.0-r1.ebuild
-1706160332 ./perl-core/Pod-Simple/Pod-Simple-3.280.0.ebuild
 2108061039 ./perl-core/Scalar-List-Utils/Scalar-List-Utils-1.560.0.ebuild
-1706160332 ./perl-core/Sys-Syslog/Sys-Syslog-0.330.0-r1.ebuild
-1702282250 ./perl-core/Term-ANSIColor/Term-ANSIColor-4.20.0.ebuild
 2105131739 ./perl-core/Test-Simple/Test-Simple-1.302.183.ebuild
 1702282250 ./perl-core/Test/Test-1.260.0.ebuild
 1702282250 ./perl-core/Text-Balanced/Text-Balanced-2.20.0-r1.ebuild
@@ -23797,8 +23797,6 @@
 1706160332 ./perl-core/Time-HiRes/Time-HiRes-1.972.600-r1.ebuild
 2002110109 ./perl-core/Unicode-Collate/Unicode-Collate-1.250.0.ebuild
 2105281809 ./perl-core/Unicode-Collate/Unicode-Collate-1.290.0.ebuild
-1706160332 ./perl-core/parent/parent-0.228-r1.ebuild
-1706160332 ./perl-core/podlators/podlators-2.5.3.ebuild
 1702282250 ./perl-core/version/version-0.990.800.ebuild
 2111240309 ./perl-core/CPAN/CPAN-2.290.0-r1.ebuild
 2109211139 ./ros-meta/ament_cmake/ament_cmake-0.9.6.ebuild
@@ -24354,8 +24352,8 @@
 2111211809 ./sci-geosciences/gpxsee/gpxsee-9.12.ebuild
 2112052139 ./sci-geosciences/gpxsee/gpxsee-9.10.ebuild
 2105292109 ./sci-geosciences/grass/grass-7.8.5.ebuild
-2110200610 ./sci-geosciences/grass/grass-7.8.6.ebuild
 2110200610 ./sci-geosciences/grass/grass-9999.ebuild
+2112071040 ./sci-geosciences/grass/grass-7.8.6.ebuild
 2002171539 ./sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
 2108222309 ./sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
 1805212239 ./sci-geosciences/gshhs/gshhs-1.13.ebuild
@@ -24428,8 +24426,8 @@
 2111221439 ./sci-geosciences/qgis/qgis-9999.ebuild
 2112052139 ./sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
 2105080609 ./sci-geosciences/qmapshack/qmapshack-1.15.2-r2.ebuild
-2106040809 ./sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
 2112050740 ./sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
+2112070940 ./sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.1.0a.ebuild
 2111050109 ./sci-geosciences/routino/routino-3.3.3.ebuild
@@ -24515,8 +24513,8 @@
 1702282250 ./sci-libs/cqrlib/cqrlib-1.1.3.ebuild
 2110120139 ./sci-libs/cxsparse/cxsparse-3.2.0.ebuild
 2106110339 ./sci-libs/dcmtk/dcmtk-3.6.5.ebuild
-2111032240 ./sci-libs/dealii/dealii-9.3.1-r1.ebuild
-2111032240 ./sci-libs/dealii/dealii-9999.ebuild
+2112070009 ./sci-libs/dealii/dealii-9.3.1-r1.ebuild
+2112070009 ./sci-libs/dealii/dealii-9999.ebuild
 2110071239 ./sci-libs/djbfft/djbfft-0.76-r3.ebuild
 2103311509 ./sci-libs/dlib/dlib-19.22.ebuild
 2102150339 ./sci-libs/dmlc-core/dmlc-core-0_p20170719.ebuild
@@ -24529,7 +24527,7 @@
 2111022139 ./sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
 2109160511 ./sci-libs/fftw/fftw-3.3.9.ebuild
 2111051509 ./sci-libs/fftw/fftw-9999.ebuild
-2112060140 ./sci-libs/fftw/fftw-3.3.10.ebuild
+2112070940 ./sci-libs/fftw/fftw-3.3.10.ebuild
 2005231409 ./sci-libs/flann/flann-1.9.1-r3.ebuild
 2110010009 ./sci-libs/fplll/fplll-5.4.0.ebuild
 1709300811 ./sci-libs/galib/galib-2.4.7-r1.ebuild
@@ -24541,12 +24539,12 @@
 2111190439 ./sci-libs/gdal/gdal-3.2.2.ebuild
 2111190439 ./sci-libs/gdal/gdal-3.3.1.ebuild
 2111190439 ./sci-libs/gdal/gdal-3.3.2-r1.ebuild
-2112060110 ./sci-libs/gdal/gdal-3.3.3.ebuild
+2112061840 ./sci-libs/gdal/gdal-3.3.3.ebuild
 2111060709 ./sci-libs/geos/geos-3.10.1.ebuild
 2101061839 ./sci-libs/geos/geos-3.8.1.ebuild
 2103072309 ./sci-libs/geos/geos-3.9.0-r2.ebuild
 2108150239 ./sci-libs/geos/geos-3.9.1.ebuild
-2112060439 ./sci-libs/geos/geos-3.10.0.ebuild
+2112061840 ./sci-libs/geos/geos-3.10.0.ebuild
 2103270609 ./sci-libs/gerris/gerris-20131206-r1.ebuild
 2102191609 ./sci-libs/getdata/getdata-0.9.0-r3.ebuild
 2110061140 ./sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild
@@ -24710,7 +24708,7 @@
 2107060739 ./sci-libs/proj/proj-8.0.1.ebuild
 2108150239 ./sci-libs/proj/proj-8.1.0-r1.ebuild
 2109050909 ./sci-libs/proj/proj-8.1.1.ebuild
-2112060439 ./sci-libs/proj/proj-8.2.0.ebuild
+2112061840 ./sci-libs/proj/proj-8.2.0.ebuild
 2103132209 ./sci-libs/punc/punc-1.5.ebuild
 2105301839 ./sci-libs/pyshp/pyshp-2.1.3.ebuild
 2110060939 ./sci-libs/qd/qd-2.3.23.ebuild
@@ -24739,7 +24737,7 @@
 2111150310 ./sci-libs/scotch/scotch-6.0.4-r2.ebuild
 2107141939 ./sci-libs/scotch/scotch-6.1.0.ebuild
 2110171109 ./sci-libs/scotch/scotch-6.1.1.ebuild
-2111210809 ./sci-libs/scotch/scotch-6.1.0-r1.ebuild
+2112070339 ./sci-libs/scotch/scotch-6.1.0-r1.ebuild
 2109171109 ./sci-libs/shapelib/shapelib-1.5.0.ebuild
 2109201009 ./sci-libs/shapely/shapely-1.7.1-r1.ebuild
 2104180939 ./sci-libs/silo/silo-4.10.2-r1.ebuild
@@ -24791,10 +24789,8 @@
 2012171039 ./sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
 2103160139 ./sci-mathematics/agda/agda-2.6.1.2.ebuild
 2101170739 ./sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
-2105042239 ./sci-mathematics/arb/arb-2.17.0.ebuild
-2104051739 ./sci-mathematics/arb/arb-2.18.1.ebuild
-2104090409 ./sci-mathematics/arb/arb-2.19.0.ebuild
 2111220639 ./sci-mathematics/arb/arb-2.21.0.ebuild
+2112061439 ./sci-mathematics/arb/arb-2.19.0.ebuild
 2102270809 ./sci-mathematics/bertini/bertini-1.4.ebuild
 2104282339 ./sci-mathematics/calc/calc-2.12.5.4.ebuild
 2104282339 ./sci-mathematics/calc/calc-2.13.0.1.ebuild
@@ -24806,9 +24802,9 @@
 2107261439 ./sci-mathematics/coq/coq-8.11.2-r1.ebuild
 2102092039 ./sci-mathematics/coq/coq-8.11.2.ebuild
 2104062209 ./sci-mathematics/coq/coq-8.12.0-r1.ebuild
-2107261439 ./sci-mathematics/coq/coq-8.12.0-r2.ebuild
 2107261439 ./sci-mathematics/coq/coq-8.13.0-r1.ebuild
 2104062209 ./sci-mathematics/coq/coq-8.13.0.ebuild
+2112070940 ./sci-mathematics/coq/coq-8.12.0-r2.ebuild
 2104052009 ./sci-mathematics/cvc4/cvc4-1.7-r1.ebuild
 2105272009 ./sci-mathematics/cvc4/cvc4-1.8.ebuild
 2102270939 ./sci-mathematics/dataplot/dataplot-20131220.ebuild
@@ -24844,8 +24840,7 @@
 1912071409 ./sci-mathematics/gmm/gmm-5.3.ebuild
 2111082209 ./sci-mathematics/gmm/gmm-5.4.ebuild
 2111220639 ./sci-mathematics/gmp-ecm/gmp-ecm-7.0.4-r4.ebuild
-2101051939 ./sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
-2101060739 ./sci-mathematics/gp2c/gp2c-0.0.12.ebuild
+2112061039 ./sci-mathematics/gp2c/gp2c-0.0.12.ebuild
 2111280210 ./sci-mathematics/gretl/gretl-2021d.ebuild
 2106030210 ./sci-mathematics/gsl-shell/gsl-shell-2.3.0_beta1-r1.ebuild
 2105311239 ./sci-mathematics/jags/jags-4.2.0.ebuild
@@ -26158,7 +26153,7 @@
 2110191339 ./sys-apps/file/file-5.41.ebuild
 2106091109 ./sys-apps/file/file-9999.ebuild
 2108221509 ./sys-apps/findutils/findutils-4.8.0.ebuild
-2112060439 ./sys-apps/findutils/findutils-4.8.0-r1.ebuild
+2112061139 ./sys-apps/findutils/findutils-4.8.0-r1.ebuild
 2003160109 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
 2102210839 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
 2102210839 ./sys-apps/firejail/firejail-0.9.64.4.ebuild
@@ -26174,7 +26169,7 @@
 2107172140 ./sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
 2111122209 ./sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
 2111122209 ./sys-apps/fwupd/fwupd-1.7.1.ebuild
-2112021909 ./sys-apps/fwupd/fwupd-1.7.2.ebuild
+2112061840 ./sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
 2107270739 ./sys-apps/fxload/fxload-20081013-r1.ebuild
 2109030510 ./sys-apps/gawk/gawk-5.1.0.ebuild
 2110292009 ./sys-apps/gawk/gawk-5.1.1-r1.ebuild
@@ -26318,7 +26313,7 @@
 2108110340 ./sys-apps/memtester/memtester-4.5.1.ebuild
 2102161539 ./sys-apps/miller/miller-5.10.0.ebuild
 2103220639 ./sys-apps/miller/miller-5.10.1.ebuild
-2112050810 ./sys-apps/miller/miller-5.10.2.ebuild
+2112070940 ./sys-apps/miller/miller-5.10.2.ebuild
 2107021539 ./sys-apps/minijail/minijail-12.ebuild
 2109241309 ./sys-apps/minijail/minijail-17.ebuild
 1702282250 ./sys-apps/minised/minised-1.15.ebuild
@@ -26548,7 +26543,8 @@
 2112052239 ./sys-apps/yarn/yarn-1.22.17.ebuild
 2004211009 ./sys-apps/zorroutils/zorroutils-0.04.ebuild
 2104180939 ./sys-apps/zorroutils/zorroutils-0.05.ebuild
-2112060009 ./sys-apps/hwdata/hwdata-0.353.ebuild
+2112061409 ./sys-apps/hwdata/hwdata-0.353.ebuild
+2112062140 ./sys-apps/zram-generator/zram-generator-1.1.1.ebuild
 2105012009 ./sys-auth/AusweisApp2/AusweisApp2-1.22.2.ebuild
 2006242209 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
 1912100909 ./sys-auth/docker_auth/docker_auth-1.3.1.ebuild
@@ -26619,14 +26615,14 @@
 2108020639 ./sys-auth/polkit-qt/polkit-qt-0.114.0.ebuild
 2106270539 ./sys-auth/polkit/polkit-0.117-r2.ebuild
 2107130109 ./sys-auth/polkit/polkit-0.119-r2.ebuild
-2112052139 ./sys-auth/polkit/polkit-0.120-r1.ebuild
+2112061840 ./sys-auth/polkit/polkit-0.120-r1.ebuild
 2108180439 ./sys-auth/realtime-base/realtime-base-0.1-r1.ebuild
 2011172239 ./sys-auth/rtkit/rtkit-0.13-r1.ebuild
 2108071139 ./sys-auth/seatd/seatd-0.5.0-r1.ebuild
 2107210539 ./sys-auth/seatd/seatd-0.5.0.ebuild
 2110151009 ./sys-auth/seatd/seatd-0.6.2-r1.ebuild
-2110231609 ./sys-auth/seatd/seatd-0.6.3.ebuild
 2110231609 ./sys-auth/seatd/seatd-9999.ebuild
+2112070540 ./sys-auth/seatd/seatd-0.6.3.ebuild
 2106252139 ./sys-auth/skey/skey-1.1.5-r12.ebuild
 2108020139 ./sys-auth/solo-python/solo-python-0.0.30.ebuild
 2111140310 ./sys-auth/solo-python/solo-python-0.0.31.ebuild
@@ -26680,7 +26676,7 @@
 2104161439 ./sys-block/megarc/megarc-1.11-r2.ebuild
 1810201509 ./sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
 1902161539 ./sys-block/ms-sys/ms-sys-2.5.3.ebuild
-2112050810 ./sys-block/ms-sys/ms-sys-2.7.0.ebuild
+2112070940 ./sys-block/ms-sys/ms-sys-2.7.0.ebuild
 2012311940 ./sys-block/mtx/mtx-1.3.12.ebuild
 2105152239 ./sys-block/nbd/nbd-3.21-r1.ebuild
 2104031809 ./sys-block/nbd/nbd-9999.ebuild
@@ -26787,7 +26783,7 @@
 2112050439 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211118.ebuild
 2101102139 ./sys-boot/refind/refind-0.11.4.ebuild
 2101201239 ./sys-boot/refind/refind-0.12.0-r1.ebuild
-2112060110 ./sys-boot/refind/refind-0.13.2.ebuild
+2112070940 ./sys-boot/refind/refind-0.13.2.ebuild
 2108170709 ./sys-boot/sgibootcd/sgibootcd-0.13.ebuild
 1808152009 ./sys-boot/shim/shim-15.5-r1.ebuild
 2012261239 ./sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -27042,12 +27038,12 @@
 2104060140 ./sys-devel/binutils/binutils-2.34-r2.ebuild
 2105160239 ./sys-devel/binutils/binutils-2.35.2.ebuild
 2108191709 ./sys-devel/binutils/binutils-2.36.1-r2.ebuild
-2111150139 ./sys-devel/binutils/binutils-2.37_p1-r1.ebuild
 2110060239 ./sys-devel/binutils/binutils-2.37_p1.ebuild
-2109160511 ./sys-devel/binutils/binutils-9999.ebuild
+2112070210 ./sys-devel/binutils/binutils-2.37_p1-r1.ebuild
+2112070210 ./sys-devel/binutils/binutils-9999.ebuild
 2105221839 ./sys-devel/bison/bison-3.7.6.ebuild
 2109130239 ./sys-devel/bison/bison-3.8.1.ebuild
-2112052239 ./sys-devel/bison/bison-3.8.2.ebuild
+2112061840 ./sys-devel/bison/bison-3.8.2.ebuild
 2111051409 ./sys-devel/bmake/bmake-20211001.ebuild
 2111051409 ./sys-devel/bmake/bmake-20211024.ebuild
 2104060140 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -27115,10 +27111,10 @@
 2106162139 ./sys-devel/lld/lld-11.1.0-r1.ebuild
 2105170439 ./sys-devel/lld/lld-11.1.0.ebuild
 2109110940 ./sys-devel/lld/lld-12.0.1.ebuild
-2111131139 ./sys-devel/lld/lld-13.0.0.ebuild
-2110030909 ./sys-devel/lld/lld-14.0.0.9999.ebuild
-2111301309 ./sys-devel/lld/lld-13.0.1.9999.ebuild
-2111301309 ./sys-devel/lld/lld-13.0.1_rc1.ebuild
+2112070210 ./sys-devel/lld/lld-13.0.0.ebuild
+2112070210 ./sys-devel/lld/lld-13.0.1.9999.ebuild
+2112070210 ./sys-devel/lld/lld-13.0.1_rc1.ebuild
+2112070210 ./sys-devel/lld/lld-14.0.0.9999.ebuild
 2105170439 ./sys-devel/llvm-common/llvm-common-11.1.0.ebuild
 2109110940 ./sys-devel/llvm-common/llvm-common-12.0.1.ebuild
 2111131139 ./sys-devel/llvm-common/llvm-common-13.0.0.ebuild
@@ -27247,8 +27243,8 @@
 2008121039 ./sys-firmware/midisport-firmware/midisport-firmware-1.2-r1.ebuild
 2101310343 ./sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
 2101251739 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
-2106220139 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
 2012120139 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild
+2112061840 ./sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
 2104161439 ./sys-firmware/seabios/seabios-1.12.0-r1.ebuild
 2104161439 ./sys-firmware/seabios/seabios-1.12.0.ebuild
 2105010109 ./sys-firmware/seabios/seabios-1.14.0-r1.ebuild
@@ -27331,8 +27327,8 @@
 2110022039 ./sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild
 2109132339 ./sys-fs/e2tools/e2tools-0.1.0-r1.ebuild
 2008170539 ./sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
-2105022109 ./sys-fs/encfs/encfs-1.9.5.ebuild
 2112021709 ./sys-fs/encfs/encfs-1.9.5-r1.ebuild
+2112071009 ./sys-fs/encfs/encfs-1.9.5-r2.ebuild
 2108152239 ./sys-fs/eudev/eudev-3.2.10-r1.ebuild
 2107180110 ./sys-fs/eudev/eudev-3.2.10.ebuild
 2107180110 ./sys-fs/eudev/eudev-3.2.5.ebuild
@@ -27412,7 +27408,7 @@
 2111231239 ./sys-fs/mtools/mtools-4.0.36.ebuild
 2110010139 ./sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
 2108041009 ./sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
-2112052209 ./sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
+2112061840 ./sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
 2107180040 ./sys-fs/ncdu/ncdu-1.15.1-r1.ebuild
 2107180040 ./sys-fs/ncdu/ncdu-1.16-r1.ebuild
 2110281709 ./sys-fs/nilfs-utils/nilfs-utils-2.2.2-r1.ebuild
@@ -27456,7 +27452,7 @@
 2107131709 ./sys-fs/udiskie/udiskie-2.3.3.ebuild
 2112011609 ./sys-fs/udiskie/udiskie-2.4.0.ebuild
 2109091110 ./sys-fs/udisks/udisks-2.9.3.ebuild
-2112052139 ./sys-fs/udisks/udisks-2.9.4.ebuild
+2112061840 ./sys-fs/udisks/udisks-2.9.4.ebuild
 2102032339 ./sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
 2109201539 ./sys-fs/unionfs-fuse/unionfs-fuse-2.2.ebuild
 2102032339 ./sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -27467,8 +27463,8 @@
 2110170110 ./sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
 2107270639 ./sys-fs/xfsdump/xfsdump-3.1.9.ebuild
 2111221640 ./sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
-2111221640 ./sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild
 2112031339 ./sys-fs/xfsprogs/xfsprogs-5.14.1.ebuild
+2112070940 ./sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild
 2104131409 ./sys-fs/xwmfs/xwmfs-0.90.ebuild
 2003221409 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
 2109132339 ./sys-fs/zerofree/zerofree-1.1.1-r1.ebuild
@@ -27720,7 +27716,7 @@
 2106100309 ./sys-libs/fortify-headers/fortify-headers-9999.ebuild
 2104180939 ./sys-libs/freeipmi/freeipmi-1.5.7.ebuild
 2102151509 ./sys-libs/freeipmi/freeipmi-1.6.7.ebuild
-2112052139 ./sys-libs/freeipmi/freeipmi-1.6.8.ebuild
+2112062309 ./sys-libs/freeipmi/freeipmi-1.6.8.ebuild
 2001301109 ./sys-libs/fts-standalone/fts-standalone-0.2-r1.ebuild
 2001301109 ./sys-libs/fts-standalone/fts-standalone-1.2.7.ebuild
 2109070039 ./sys-libs/gdbm/gdbm-1.20.ebuild
@@ -27980,7 +27976,7 @@
 2012231444 ./sys-process/nmon/nmon-16g.ebuild
 1903261209 ./sys-process/nmon/nmon-16i.ebuild
 1905230039 ./sys-process/nmon/nmon-16j.ebuild
-2112050810 ./sys-process/nmon/nmon-16m.ebuild
+2112070940 ./sys-process/nmon/nmon-16m.ebuild
 2107052010 ./sys-process/numactl/numactl-2.0.14.ebuild
 2105131709 ./sys-process/numactl/numactl-9999.ebuild
 2109050109 ./sys-process/numad/numad-0.5-r3.ebuild
@@ -28427,7 +28423,7 @@
 2112031039 ./www-client/chromium/chromium-97.0.4692.36.ebuild
 2104302139 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2002231739 ./www-client/dillo/dillo-9999.ebuild
-2112052209 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
+2112070940 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2111011140 ./www-client/elinks/elinks-0.13.5-r100.ebuild
 2111011140 ./www-client/elinks/elinks-9999.ebuild
 2108090439 ./www-client/epiphany/epiphany-40.2.ebuild
@@ -28440,11 +28436,15 @@
 2110060439 ./www-client/firefox-bin/firefox-bin-93.0.ebuild
 2111040309 ./www-client/firefox-bin/firefox-bin-94.0.1.ebuild
 2111200609 ./www-client/firefox-bin/firefox-bin-94.0.2.ebuild
+2112061840 ./www-client/firefox-bin/firefox-bin-91.4.0.ebuild
+2112061840 ./www-client/firefox-bin/firefox-bin-95.0.ebuild
 2110230339 ./www-client/firefox/firefox-78.15.0.ebuild
 2111050709 ./www-client/firefox/firefox-91.3.0.ebuild
 2110230339 ./www-client/firefox/firefox-93.0.ebuild
 2111100009 ./www-client/firefox/firefox-94.0.1-r1.ebuild
 2111200609 ./www-client/firefox/firefox-94.0.2.ebuild
+2112061840 ./www-client/firefox/firefox-91.4.0.ebuild
+2112061909 ./www-client/firefox/firefox-95.0.ebuild
 2112020039 ./www-client/google-chrome-beta/google-chrome-beta-97.0.4692.36.ebuild
 2112020039 ./www-client/google-chrome-unstable/google-chrome-unstable-98.0.4736.0.ebuild
 2111172339 ./www-client/google-chrome/google-chrome-96.0.4664.45.ebuild
@@ -28505,7 +28505,7 @@
 1703051206 ./www-misc/log-toolkit/log-toolkit-0.9.6-r1.ebuild
 2104021709 ./www-misc/mergelog/mergelog-4.5-r2.ebuild
 2011200439 ./www-misc/monitorix/monitorix-3.12.0.ebuild
-2112060110 ./www-misc/monitorix/monitorix-3.13.1.ebuild
+2112061439 ./www-misc/monitorix/monitorix-3.13.1.ebuild
 1807080109 ./www-misc/multisort/multisort-1.1-r2.ebuild
 1910071209 ./www-misc/profile-sync-daemon/profile-sync-daemon-5.75.ebuild
 1902221509 ./www-misc/profile-sync-daemon/profile-sync-daemon-6.31.ebuild
@@ -28610,7 +28610,7 @@
 2106030210 ./x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
 2104060140 ./x11-apps/listres/listres-1.0.4.ebuild
 2101061509 ./x11-apps/luit/luit-20190106.ebuild
-2112052209 ./x11-apps/luit/luit-20210218.ebuild
+2112070940 ./x11-apps/luit/luit-20210218.ebuild
 2111220839 ./x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
 2111220839 ./x11-apps/mesa-progs/mesa-progs-9999.ebuild
 2104060140 ./x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
@@ -28972,7 +28972,7 @@
 2106071909 ./x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
 2004032241 ./x11-misc/fbdesk/fbdesk-1.4.1.ebuild
 2106031539 ./x11-misc/fbpager/fbpager-20090221-r1.ebuild
-2112052209 ./x11-misc/fbpager/fbpager-20090221-r2.ebuild
+2112070940 ./x11-misc/fbpager/fbpager-20090221-r2.ebuild
 2106030939 ./x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
 2110162109 ./x11-misc/fireflies/fireflies-2.08-r1.ebuild
 2104252239 ./x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild
@@ -29133,8 +29133,8 @@
 1911180539 ./x11-misc/set_opacity/set_opacity-1.0.ebuild
 1911180539 ./x11-misc/set_opacity/set_opacity-9999.ebuild
 2111220310 ./x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild
-2110271709 ./x11-misc/shutter/shutter-0.99.2.ebuild
 2110121039 ./x11-misc/shutter/shutter-0.99.ebuild
+2112061439 ./x11-misc/shutter/shutter-0.99.2.ebuild
 2103162239 ./x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
 2103162239 ./x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
 2103280209 ./x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
@@ -29512,7 +29512,7 @@
 2111261710 ./x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild
 2111301109 ./x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild
 2106301339 ./x11-terms/sakura/sakura-3.7.1.ebuild
-2112050840 ./x11-terms/sakura/sakura-3.8.3.ebuild
+2112070940 ./x11-terms/sakura/sakura-3.8.3.ebuild
 2110142039 ./x11-terms/st/st-0.8.4-r1.ebuild
 2109211710 ./x11-terms/st/st-0.8.4.ebuild
 2110142039 ./x11-terms/st/st-9999.ebuild
@@ -29860,7 +29860,6 @@
 2111190939 ./xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
 2111061139 ./xfce-extra/xfdashboard/xfdashboard-0.9.5.ebuild
 2101010309 ./skel.ebuild
-2111160110 metadata/md5-cache/acct-group/Manifest.gz
 2106241909 metadata/md5-cache/acct-group/abrt-0-r1
 2106241909 metadata/md5-cache/acct-group/adm-0-r1
 2107101509 metadata/md5-cache/acct-group/aerospike-amc-0
@@ -30312,6 +30311,8 @@
 2106241909 metadata/md5-cache/acct-group/ziproxy-0
 2106241909 metadata/md5-cache/acct-group/znc-0-r1
 2107101509 metadata/md5-cache/acct-group/zookeeper-0
+2112071409 metadata/md5-cache/acct-group/Manifest.gz
+2112071409 metadata/md5-cache/acct-group/ejabberd-0
 2106241909 metadata/md5-cache/acct-user/abrt-0-r1
 2107101509 metadata/md5-cache/acct-user/aerospike-amc-0
 2106241909 metadata/md5-cache/acct-user/airdcppd-0-r1
@@ -30718,8 +30719,9 @@
 2106241909 metadata/md5-cache/acct-user/znc-0-r1
 2107101509 metadata/md5-cache/acct-user/zookeeper-0
 2111240009 metadata/md5-cache/acct-user/subsonic-0-r1
-2112012339 metadata/md5-cache/acct-user/Manifest.gz
 2112012339 metadata/md5-cache/acct-user/root-0-r1
+2112071409 metadata/md5-cache/acct-user/Manifest.gz
+2112071409 metadata/md5-cache/acct-user/ejabberd-0
 2111091344 metadata/md5-cache/app-accessibility/accerciser-3.38.0
 2111180910 metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
 2111091344 metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
@@ -31100,9 +31102,10 @@
 2112030239 metadata/md5-cache/app-admin/awscli-1.22.19
 2112040909 metadata/md5-cache/app-admin/awscli-1.22.20
 2112041139 metadata/md5-cache/app-admin/lnav-0.10.1
-2112060510 metadata/md5-cache/app-admin/Manifest.gz
 2112060510 metadata/md5-cache/app-admin/haskell-updater-1.3.2-r1
 2112060009 metadata/md5-cache/app-admin/usbview-2.1
+2112070240 metadata/md5-cache/app-admin/Manifest.gz
+2112070240 metadata/md5-cache/app-admin/awscli-1.22.21
 2111142339 metadata/md5-cache/app-antivirus/clamav-0.103.4
 2111091344 metadata/md5-cache/app-antivirus/clamav-0.104.0-r1
 2111091344 metadata/md5-cache/app-antivirus/clamav-0.104.1
@@ -31239,10 +31242,10 @@
 2111191039 metadata/md5-cache/app-arch/unp-2.0_pre9
 2111230440 metadata/md5-cache/app-arch/engrampa-1.24.2
 2111230440 metadata/md5-cache/app-arch/file-roller-3.40.0
-2112060439 metadata/md5-cache/app-arch/Manifest.gz
-2112060439 metadata/md5-cache/app-arch/gzip-1.11
-2112052209 metadata/md5-cache/app-arch/rpm-4.17.0
 2112052139 metadata/md5-cache/app-arch/wimlib-1.13.4-r1
+2112062210 metadata/md5-cache/app-arch/Manifest.gz
+2112061839 metadata/md5-cache/app-arch/gzip-1.11
+2112062210 metadata/md5-cache/app-arch/rpm-4.17.0
 2110012311 metadata/md5-cache/app-backup/amanda-3.5.1-r3
 2111091344 metadata/md5-cache/app-backup/attic-0.16-r1
 2111091344 metadata/md5-cache/app-backup/attic-9999
@@ -31307,10 +31310,6 @@
 2011021309 metadata/md5-cache/app-backup/rsnapshot-1.4.3
 2108190940 metadata/md5-cache/app-backup/sarab-1.0.0
 1708081209 metadata/md5-cache/app-backup/simplebackup-1.8.1-r1
-2110012311 metadata/md5-cache/app-backup/snapper-0.8.15-r2
-2110012311 metadata/md5-cache/app-backup/snapper-0.8.16-r1
-2110121039 metadata/md5-cache/app-backup/snapper-0.9.0-r1
-2110012311 metadata/md5-cache/app-backup/snapper-0.9.1
 2109040224 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r1
 2110312244 metadata/md5-cache/app-backup/synology-cloud-station-backup-4469
 2109132339 metadata/md5-cache/app-backup/tarsnap-1.0.39-r1
@@ -31323,8 +31322,9 @@
 2111281610 metadata/md5-cache/app-backup/backupninja-1.2.1-r1
 2111292010 metadata/md5-cache/app-backup/kup-0.9.1
 2112050709 metadata/md5-cache/app-backup/backintime-1.3.1
-2112060110 metadata/md5-cache/app-backup/Manifest.gz
-2112060110 metadata/md5-cache/app-backup/dar-2.7.2
+2112071209 metadata/md5-cache/app-backup/Manifest.gz
+2112070940 metadata/md5-cache/app-backup/dar-2.7.2
+2112070940 metadata/md5-cache/app-backup/snapper-0.9.1
 2109040224 metadata/md5-cache/app-benchmarks/bashmark-0.6.2
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 2109040224 metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r2
@@ -31437,8 +31437,6 @@
 2109040224 metadata/md5-cache/app-crypt/aespipe-2.4e
 2109040224 metadata/md5-cache/app-crypt/aespipe-2.4f
 2109240040 metadata/md5-cache/app-crypt/age-1.0.0
-2109240040 metadata/md5-cache/app-crypt/age-1.0.0_rc2
-2109240040 metadata/md5-cache/app-crypt/age-1.0.0_rc3
 2109040224 metadata/md5-cache/app-crypt/argon2-20190702
 2103052109 metadata/md5-cache/app-crypt/asedriveiiie-serial-3.5
 2006062109 metadata/md5-cache/app-crypt/asedriveiiie-usb-3.5
@@ -31637,7 +31635,6 @@
 2109040224 metadata/md5-cache/app-crypt/tc-play-2.0-r1
 2110312244 metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r3
 2110012311 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.1-r1
-2110012311 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2
 2110012311 metadata/md5-cache/app-crypt/tpm2-abrmd-2.4.0
 2111091344 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.7.0
 2110012311 metadata/md5-cache/app-crypt/tpm2-tools-4.3.2
@@ -31645,7 +31642,6 @@
 2110012311 metadata/md5-cache/app-crypt/tpm2-totp-0.3.0
 2110182240 metadata/md5-cache/app-crypt/tpm2-tss-2.4.5
 2110182240 metadata/md5-cache/app-crypt/tpm2-tss-2.4.6
-2110182240 metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
 2110012311 metadata/md5-cache/app-crypt/tpm2-tss-engine-1.1.0
 2110182240 metadata/md5-cache/app-crypt/trousers-0.3.14-r3
 2110182240 metadata/md5-cache/app-crypt/trousers-0.3.15
@@ -31679,13 +31675,15 @@
 2112041339 metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129
 2112030939 metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
 2112030809 metadata/md5-cache/app-crypt/xca-2.4.0-r2
-2112060110 metadata/md5-cache/app-crypt/Manifest.gz
 2112052109 metadata/md5-cache/app-crypt/acme-1.21.0
 2112052109 metadata/md5-cache/app-crypt/certbot-1.21.0
 2112052109 metadata/md5-cache/app-crypt/certbot-apache-1.21.0
 2112052109 metadata/md5-cache/app-crypt/certbot-nginx-1.21.0
-2112052239 metadata/md5-cache/app-crypt/libmd-1.0.4
-2112060110 metadata/md5-cache/app-crypt/nitrocli-0.4.1
+2112070940 metadata/md5-cache/app-crypt/Manifest.gz
+2112061839 metadata/md5-cache/app-crypt/libmd-1.0.4
+2112070940 metadata/md5-cache/app-crypt/nitrocli-0.4.1
+2112070940 metadata/md5-cache/app-crypt/tpm-tools-1.3.9.2
+2112070940 metadata/md5-cache/app-crypt/tpm2-tss-3.1.0
 2107072309 metadata/md5-cache/app-dicts/aspell-af-0.50.0
 2107072309 metadata/md5-cache/app-dicts/aspell-am-0.03.1
 2107072309 metadata/md5-cache/app-dicts/aspell-ar-1.2.0
@@ -33048,13 +33046,9 @@
 2107052310 metadata/md5-cache/app-emulation/virt-what-1.21
 2101181209 metadata/md5-cache/app-emulation/virtio-win-0.1.190.1
 2108251939 metadata/md5-cache/app-emulation/virtualbox-additions-6.1.24
-2110201439 metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
 2108251939 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.24
-2110201439 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
 2110252309 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.24
-2110252309 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
 2110252309 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.24
-2110252309 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
 2109040224 metadata/md5-cache/app-emulation/vkd3d-1.0
 2109040224 metadata/md5-cache/app-emulation/vkd3d-1.1
 2109040224 metadata/md5-cache/app-emulation/vkd3d-1.1-r1
@@ -33109,15 +33103,20 @@
 2112022010 metadata/md5-cache/app-emulation/edumips64-1.2
 2112020709 metadata/md5-cache/app-emulation/lxc-4.0.11_p1-r1
 2112022010 metadata/md5-cache/app-emulation/virtualbox-6.1.24-r1
-2112022010 metadata/md5-cache/app-emulation/virtualbox-6.1.28-r1
 2112022010 metadata/md5-cache/app-emulation/virtualbox-6.1.30
 2112050740 metadata/md5-cache/app-emulation/cri-tools-1.21.0
 2112030739 metadata/md5-cache/app-emulation/snapd-2.53.4
 2112050109 metadata/md5-cache/app-emulation/wine-staging-6.23
 2112050109 metadata/md5-cache/app-emulation/wine-vanilla-6.23
-2112052209 metadata/md5-cache/app-emulation/Manifest.gz
 2112052109 metadata/md5-cache/app-emulation/diskimage-builder-3.16.0
 2112052209 metadata/md5-cache/app-emulation/dlx-1.5.20
+2112070710 metadata/md5-cache/app-emulation/Manifest.gz
+2112070710 metadata/md5-cache/app-emulation/conmon-2.0.31
+2112070039 metadata/md5-cache/app-emulation/virtualbox-6.1.28-r1
+2112070039 metadata/md5-cache/app-emulation/virtualbox-additions-6.1.28
+2112070039 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.28
+2112070039 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.28
+2112070039 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.28
 2104060140 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2107020209 metadata/md5-cache/app-eselect/eselect-blas-0.2
@@ -33164,7 +33163,6 @@
 2105061309 metadata/md5-cache/app-eselect/eselect-timezone-0.2
 2109021309 metadata/md5-cache/app-eselect/eselect-timidity-20110513
 2101170739 metadata/md5-cache/app-eselect/eselect-unison-0.4
-1912200109 metadata/md5-cache/app-eselect/eselect-vdr-0.0.3
 2110012311 metadata/md5-cache/app-eselect/eselect-vi-1.2
 2002112051 metadata/md5-cache/app-eselect/eselect-wine-1.2.2
 2109040224 metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
@@ -33172,8 +33170,8 @@
 2111211309 metadata/md5-cache/app-eselect/eselect-gradle-0.2-r1
 2111292209 metadata/md5-cache/app-eselect/eselect-scala-0.1.1-r1
 2112032239 metadata/md5-cache/app-eselect/eselect-iptables-20211203
-2112060110 metadata/md5-cache/app-eselect/Manifest.gz
 2112060110 metadata/md5-cache/app-eselect/eselect-vdr-0.0.4
+2112061039 metadata/md5-cache/app-eselect/Manifest.gz
 2111091344 metadata/md5-cache/app-forensics/afflib-3.7.19
 2109040224 metadata/md5-cache/app-forensics/afl-2.56b-r1
 2109040224 metadata/md5-cache/app-forensics/afl-2.57b-r1
@@ -33293,7 +33291,6 @@
 2108060339 metadata/md5-cache/app-i18n/man-pages-l10n-4.10.0
 2107240239 metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
 2104060140 metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
-2110311009 metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.6
 2110012311 metadata/md5-cache/app-i18n/mecab-skkserv-0.03
 2111091344 metadata/md5-cache/app-i18n/mozc-2.23.2815.102
 2111091344 metadata/md5-cache/app-i18n/mozc-2.26.4220_p20201212102434_p20201219202429
@@ -33388,8 +33385,9 @@
 2111281640 metadata/md5-cache/app-i18n/ibus-typing-booster-2.14.13-r1
 2111291639 metadata/md5-cache/app-i18n/ibus-anthy-1.5.13
 2112031639 metadata/md5-cache/app-i18n/ibus-typing-booster-2.15.11
-2112052139 metadata/md5-cache/app-i18n/Manifest.gz
 2112052139 metadata/md5-cache/app-i18n/cstools-3.44
+2112061439 metadata/md5-cache/app-i18n/Manifest.gz
+2112061439 metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.6
 2110012311 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2110182240 metadata/md5-cache/app-laptop/hdapsd-20141203-r2
@@ -33924,15 +33922,14 @@
 2111301409 metadata/md5-cache/app-misc/away-0.9.5-r2
 2112020639 metadata/md5-cache/app-misc/delay-1.6-r2
 2112020239 metadata/md5-cache/app-misc/golly-4.1-r1
-2112022010 metadata/md5-cache/app-misc/rundeck-bin-2.6.8
 2112022010 metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.11
 2112021009 metadata/md5-cache/app-misc/ytree-2.04
 2112041839 metadata/md5-cache/app-misc/broot-1.7.4
-2112050839 metadata/md5-cache/app-misc/wcd-6.0.3-r2
 2112030510 metadata/md5-cache/app-misc/yq-2.13.0
-2112060009 metadata/md5-cache/app-misc/Manifest.gz
 2112052139 metadata/md5-cache/app-misc/beanstalkd-1.12
-2112060009 metadata/md5-cache/app-misc/beep-1.4.9-r1
+2112071310 metadata/md5-cache/app-misc/Manifest.gz
+2112061839 metadata/md5-cache/app-misc/beep-1.4.9-r1
+2112061839 metadata/md5-cache/app-misc/wcd-6.0.3-r2
 2111091344 metadata/md5-cache/app-mobilephone/adb-sync-0_p20190101
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 2111100039 metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -34020,27 +34017,24 @@
 2112022309 metadata/md5-cache/app-office/libreoffice-bin-debug-7.1.7.2
 2112022309 metadata/md5-cache/app-office/libreoffice-l10n-7.1.7.2
 2112022010 metadata/md5-cache/app-office/moneydance-2022.4058
-2112052209 metadata/md5-cache/app-office/Manifest.gz
 2112052209 metadata/md5-cache/app-office/calcurse-4.7.1
 2112052209 metadata/md5-cache/app-office/homebank-5.5.2-r1
 2112052209 metadata/md5-cache/app-office/mdbtools-1.0.0
-2112052139 metadata/md5-cache/app-office/texstudio-4.0.2
-2111111509 metadata/md5-cache/app-officeext/Manifest.gz
+2112061439 metadata/md5-cache/app-office/Manifest.gz
+2112061439 metadata/md5-cache/app-office/texstudio-4.0.2
 2111111509 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2106262046 metadata/md5-cache/app-officeext/ct2n-1.5.0
 2111111509 metadata/md5-cache/app-officeext/dmaths-3.4.9.0-r1
 2106262046 metadata/md5-cache/app-officeext/languagetool-5.1.3-r1
 2106262046 metadata/md5-cache/app-officeext/ooo2gd-3.0.0-r2
-2106262046 metadata/md5-cache/app-officeext/ooofbtools-2.56
 2106262046 metadata/md5-cache/app-officeext/ooofbtools-2.57
 2106262046 metadata/md5-cache/app-officeext/ooofbtools-3.0
 2111111509 metadata/md5-cache/app-officeext/sun-templates-1.0.0-r1
 2106262046 metadata/md5-cache/app-officeext/texmaths-0.48
 2106262046 metadata/md5-cache/app-officeext/texmaths-0.48.2
-2111091344 metadata/md5-cache/app-pda/Manifest.gz
+2112061909 metadata/md5-cache/app-officeext/Manifest.gz
 2110312244 metadata/md5-cache/app-pda/barry-0.18.3
 2110012311 metadata/md5-cache/app-pda/dynamite-0.1.1_p20120512
-2109040224 metadata/md5-cache/app-pda/gnupod-0.99.8-r2
 2110312244 metadata/md5-cache/app-pda/gtkpod-2.1.5-r3
 2110242009 metadata/md5-cache/app-pda/ideviceinstaller-1.1.0
 2108190940 metadata/md5-cache/app-pda/ifuse-1.1.3-r1
@@ -34052,6 +34046,7 @@
 2110012311 metadata/md5-cache/app-pda/pilot-link-0.12.5-r3
 2110012311 metadata/md5-cache/app-pda/usbmuxd-1.1.1
 2110012311 metadata/md5-cache/app-pda/usbmuxd-1.1.1_pre20200121
+2112061039 metadata/md5-cache/app-pda/Manifest.gz
 2109040224 metadata/md5-cache/app-portage/conf-update-1.0.3-r1
 2101061639 metadata/md5-cache/app-portage/cpuid2cpuflags-11
 2110012311 metadata/md5-cache/app-portage/cpuid2cpuflags-9999
@@ -34264,8 +34259,8 @@
 2111210409 metadata/md5-cache/app-shells/pwsh-bin-7.2.0
 2112040439 metadata/md5-cache/app-shells/loksh-7.0
 2112040609 metadata/md5-cache/app-shells/mcfly-0.5.10
-2112060439 metadata/md5-cache/app-shells/Manifest.gz
-2112060439 metadata/md5-cache/app-shells/dash-0.5.11.5
+2112061839 metadata/md5-cache/app-shells/Manifest.gz
+2112061839 metadata/md5-cache/app-shells/dash-0.5.11.5
 2103010009 metadata/md5-cache/app-text/XML-Schema-learner-1.0.1
 2110012311 metadata/md5-cache/app-text/a2ps-4.14-r6
 2109072209 metadata/md5-cache/app-text/agrep-2.04-r2
@@ -34434,7 +34429,6 @@
 2111140839 metadata/md5-cache/app-text/libetonyek-9999
 2107232139 metadata/md5-cache/app-text/libexttextcat-3.4.5
 2111181509 metadata/md5-cache/app-text/libexttextcat-3.4.6
-2111091344 metadata/md5-cache/app-text/libgepub-0.6.0
 2111091344 metadata/md5-cache/app-text/libgxps-0.3.2
 2110312244 metadata/md5-cache/app-text/liblangtag-0.6.3
 2109040224 metadata/md5-cache/app-text/libmspub-0.1.4
@@ -34518,7 +34512,6 @@
 2110012311 metadata/md5-cache/app-text/pinfo-0.6.13
 2110012311 metadata/md5-cache/app-text/pinfo-99999
 2110312244 metadata/md5-cache/app-text/podofo-0.9.6_p20190928-r100
-2110312244 metadata/md5-cache/app-text/poppler-21.07.0
 2111061809 metadata/md5-cache/app-text/poppler-9999
 2104060140 metadata/md5-cache/app-text/poppler-data-0.4.10
 2109072039 metadata/md5-cache/app-text/poppler-data-0.4.11
@@ -34708,18 +34701,19 @@
 2112030739 metadata/md5-cache/app-text/calibre-5.33.0
 2112031109 metadata/md5-cache/app-text/discount-2.2.7-r2
 2112042109 metadata/md5-cache/app-text/gspell-1.9.1
-2112041139 metadata/md5-cache/app-text/mupdf-1.19.0
 2112042239 metadata/md5-cache/app-text/poppler-21.11.0
 2112041339 metadata/md5-cache/app-text/ronn-0.7.3-r4
 2112041339 metadata/md5-cache/app-text/ronn-ng-0.9.1
-2112060609 metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
-2112060609 metadata/md5-cache/app-text/Manifest.gz
 2112052209 metadata/md5-cache/app-text/calibre-5.33.2
-2112052209 metadata/md5-cache/app-text/dvisvgm-2.12
-2112060339 metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
 2112052139 metadata/md5-cache/app-text/lesspipe-1.90
 2112051109 metadata/md5-cache/app-text/ronn-ng-0.9.1-r1
-2112060439 metadata/md5-cache/app-text/t1utils-1.42
+2112070940 metadata/md5-cache/app-text/App-XML-DocBook-Builder-0.100.300-r1
+2112070940 metadata/md5-cache/app-text/Manifest.gz
+2112061839 metadata/md5-cache/app-text/dvisvgm-2.12
+2112061839 metadata/md5-cache/app-text/ghostscript-gpl-9.55.0-r1
+2112070009 metadata/md5-cache/app-text/libgepub-0.6.0
+2112070210 metadata/md5-cache/app-text/mupdf-1.19.0
+2112061839 metadata/md5-cache/app-text/t1utils-1.42
 2107230839 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
 2107230839 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2107230839 metadata/md5-cache/app-vim/airline-0.11
@@ -34959,8 +34953,11 @@
 2107230839 metadata/md5-cache/app-vim/yankring-19.0-r1
 2107230839 metadata/md5-cache/app-vim/zenburn-2.25
 2107230839 metadata/md5-cache/app-vim/zoomwin-24-r1
-2111241010 metadata/md5-cache/app-vim/Manifest.gz
 2111241010 metadata/md5-cache/app-vim/command-t-5.0.3-r1
+2112070610 metadata/md5-cache/app-vim/Manifest.gz
+2112070610 metadata/md5-cache/app-vim/bash-support-4.3
+2112070610 metadata/md5-cache/app-vim/lustyexplorer-5.0
+2112070610 metadata/md5-cache/app-vim/tlib-1.27
 2110100009 metadata/md5-cache/app-xemacs/Manifest.gz
 2106210056 metadata/md5-cache/app-xemacs/ada-1.16
 2106210056 metadata/md5-cache/app-xemacs/apel-1.36
@@ -35128,9 +35125,10 @@
 2111251109 metadata/md5-cache/dev-ada/libgpr-22.0.0
 2111251109 metadata/md5-cache/dev-ada/xmlada-2021-r1
 2111251109 metadata/md5-cache/dev-ada/xmlada-22.0.0
-2111281710 metadata/md5-cache/dev-ada/Manifest.gz
 2111281710 metadata/md5-cache/dev-ada/e3-core-22.1.0
 2111281710 metadata/md5-cache/dev-ada/e3-testsuite-24.0
+2112061609 metadata/md5-cache/dev-ada/Manifest.gz
+2112061609 metadata/md5-cache/dev-ada/langkit-22.0.0
 2110012311 metadata/md5-cache/dev-cpp/ETL-1.4.1
 2111091344 metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2-r1
 2111161510 metadata/md5-cache/dev-cpp/abseil-cpp-20210324.1
@@ -35144,7 +35142,6 @@
 2110312244 metadata/md5-cache/dev-cpp/argparse-2.1
 2004032241 metadata/md5-cache/dev-cpp/asio-1.10.8
 2110041409 metadata/md5-cache/dev-cpp/asio-1.19.2
-2110170039 metadata/md5-cache/dev-cpp/asio-1.20.0
 2111061939 metadata/md5-cache/dev-cpp/asio-1.21.0
 2111091344 metadata/md5-cache/dev-cpp/atkmm-2.28.2
 2111091344 metadata/md5-cache/dev-cpp/atkmm-2.36.1
@@ -35246,9 +35243,10 @@
 2112040739 metadata/md5-cache/dev-cpp/elfio-3.9
 2112041609 metadata/md5-cache/dev-cpp/notcurses-3.0.0
 2112040739 metadata/md5-cache/dev-cpp/termcolor-2.0.0
-2112060339 metadata/md5-cache/dev-cpp/Manifest.gz
-2112060339 metadata/md5-cache/dev-cpp/gtest-1.11.0
 2112052139 metadata/md5-cache/dev-cpp/websocketpp-0.8.2
+2112070940 metadata/md5-cache/dev-cpp/Manifest.gz
+2112070940 metadata/md5-cache/dev-cpp/asio-1.20.0
+2112070940 metadata/md5-cache/dev-cpp/gtest-1.11.0
 2111091344 metadata/md5-cache/dev-db/barman-2.12
 2111141709 metadata/md5-cache/dev-db/bucardo-5.4.1
 2111101709 metadata/md5-cache/dev-db/cdb-0.75-r4
@@ -35299,7 +35297,6 @@
 2111091344 metadata/md5-cache/dev-db/mongodb-4.2.15-r1
 2111091344 metadata/md5-cache/dev-db/mongodb-4.4.8-r1
 2111091344 metadata/md5-cache/dev-db/mongodb-5.0.2-r1
-2109040224 metadata/md5-cache/dev-db/mtop-0.6.6-r3
 2111091344 metadata/md5-cache/dev-db/mycli-1.22.2_p20201026
 2111091344 metadata/md5-cache/dev-db/mycli-1.24.1
 2111091344 metadata/md5-cache/dev-db/mycli-9999
@@ -35418,7 +35415,6 @@
 2110012311 metadata/md5-cache/dev-db/postgis-3.1.2
 2110012311 metadata/md5-cache/dev-db/postgis-3.1.3
 2110012311 metadata/md5-cache/dev-db/postgis-3.1.4
-2110251839 metadata/md5-cache/dev-db/postgis-3.2.0_beta1
 2110012311 metadata/md5-cache/dev-db/postgis-9999
 2111170540 metadata/md5-cache/dev-db/postgresql-10.19
 2111170540 metadata/md5-cache/dev-db/postgresql-11.14
@@ -35471,7 +35467,6 @@
 2110312244 metadata/md5-cache/dev-db/timescaledb-2.4.1
 2110312244 metadata/md5-cache/dev-db/timescaledb-2.4.2
 2111052109 metadata/md5-cache/dev-db/tinycdb-0.78
-2110012311 metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
 2110312244 metadata/md5-cache/dev-db/tora-3.2-r1
 2110312244 metadata/md5-cache/dev-db/tora-9999
 2109040224 metadata/md5-cache/dev-db/unixODBC-2.3.9
@@ -35489,7 +35484,6 @@
 2111281010 metadata/md5-cache/dev-db/timescaledb-2.5.0
 2111292010 metadata/md5-cache/dev-db/kdb-3.2.0-r1
 2111291139 metadata/md5-cache/dev-db/m17n-db-1.8.0
-2112022010 metadata/md5-cache/dev-db/Manifest.gz
 2112022010 metadata/md5-cache/dev-db/apgdiff-2.7.0
 2112022010 metadata/md5-cache/dev-db/db-je-3.3.75
 2112022010 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
@@ -35517,6 +35511,9 @@
 2112022010 metadata/md5-cache/dev-db/sqlcl-bin-21.3.1.281.1748
 2112022010 metadata/md5-cache/dev-db/sqldeveloper-21.2.1.204.1703
 2112022010 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
+2112071310 metadata/md5-cache/dev-db/Manifest.gz
+2112061839 metadata/md5-cache/dev-db/postgis-3.2.0_beta3
+2112062339 metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r1
 2106290046 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
 2109040224 metadata/md5-cache/dev-dotnet/libgdiplus-6.0.2
 2109040224 metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
@@ -35541,7 +35538,6 @@
 2109040224 metadata/md5-cache/dev-embedded/dc-tool-ip-1.0.4
 2111150540 metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
 2111091344 metadata/md5-cache/dev-embedded/esptool-3.1
-2111091344 metadata/md5-cache/dev-embedded/esptool-3.2
 2104180939 metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.0
 2110312244 metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
 2105311239 metadata/md5-cache/dev-embedded/gpsim-0.30.0
@@ -35595,11 +35591,12 @@
 2109040224 metadata/md5-cache/dev-embedded/xa-2.3.10
 2109040224 metadata/md5-cache/dev-embedded/zmac-1.3-r1
 2111241210 metadata/md5-cache/dev-embedded/lpc21isp-1.97
-2112022010 metadata/md5-cache/dev-embedded/Manifest.gz
 2112022010 metadata/md5-cache/dev-embedded/arduino-1.8.13
 2112022010 metadata/md5-cache/dev-embedded/arduino-1.8.7
 2112022010 metadata/md5-cache/dev-embedded/arduino-listserialportsc-1.4.0
 2112012209 metadata/md5-cache/dev-embedded/rpi-eeprom-12.5_p1-r1
+2112071110 metadata/md5-cache/dev-embedded/Manifest.gz
+2112071110 metadata/md5-cache/dev-embedded/esptool-3.2
 2107082209 metadata/md5-cache/dev-erlang/Manifest.gz
 2106011239 metadata/md5-cache/dev-erlang/base64url-1.0.1
 2106011239 metadata/md5-cache/dev-erlang/cache_tab-1.0.23
@@ -36637,7 +36634,6 @@
 2112022010 metadata/md5-cache/dev-java/ant-commons-logging-1.10.9
 2112022010 metadata/md5-cache/dev-java/ant-commons-net-1.10.9
 2112022010 metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r2
-2112022010 metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123
 2112022010 metadata/md5-cache/dev-java/ant-core-1.10.9
 2112022010 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10-r1
 2112022010 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.13
@@ -36899,13 +36895,11 @@
 2112022010 metadata/md5-cache/dev-java/jnr-a64asm-1.0.0
 2112022010 metadata/md5-cache/dev-java/jnr-constants-0.10.3
 2112022010 metadata/md5-cache/dev-java/jnr-constants-0.8.6
-2112022010 metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
 2112022010 metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
 2112022010 metadata/md5-cache/dev-java/jnr-ffi-2.2.8
 2112022010 metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
 2112022010 metadata/md5-cache/dev-java/jnr-posix-3.0.10
 2112022010 metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
-2112022010 metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
 2112022010 metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
 2112022010 metadata/md5-cache/dev-java/joda-convert-1.3.1-r1
 2112022010 metadata/md5-cache/dev-java/joda-time-2.10.10-r1
@@ -36966,8 +36960,6 @@
 2112022010 metadata/md5-cache/dev-java/milton-api-2.7.1.3
 2112022010 metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
 2112022010 metadata/md5-cache/dev-java/mimepull-1.9.6-r2
-2112022010 metadata/md5-cache/dev-java/mina-core-1.1.7-r1
-2112022010 metadata/md5-cache/dev-java/mina-core-2.0.7-r1
 2112022010 metadata/md5-cache/dev-java/mockito-1.9.5-r2
 2112022010 metadata/md5-cache/dev-java/mojarra-2.2.12-r1
 2112022010 metadata/md5-cache/dev-java/moshi-1.1.0
@@ -37058,7 +37050,6 @@
 2112022010 metadata/md5-cache/dev-java/swing-layout-1.0.4-r1
 2112022010 metadata/md5-cache/dev-java/swingx-1.6.4-r1
 2112022010 metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
-2112022010 metadata/md5-cache/dev-java/swingx-ws-1.0-r1
 2112022010 metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
 2112022010 metadata/md5-cache/dev-java/swt-3.7.2-r3
 2112022010 metadata/md5-cache/dev-java/swt-3.8.2-r3
@@ -37119,10 +37110,11 @@
 2112022010 metadata/md5-cache/dev-java/xz-java-1.9
 2112022010 metadata/md5-cache/dev-java/yanfs-1.0
 2112022010 metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
-2112041939 metadata/md5-cache/dev-java/Manifest.gz
 2112041939 metadata/md5-cache/dev-java/ant-ivy-2.5.0
 2112031239 metadata/md5-cache/dev-java/bcel-6.5.0-r2
 2112030309 metadata/md5-cache/dev-java/dom4j-2.1.3
+2112071110 metadata/md5-cache/dev-java/Manifest.gz
+2112071110 metadata/md5-cache/dev-java/ant-contrib-1.0_beta6_pre20201123-r1
 2110012311 metadata/md5-cache/dev-lang/R-4.0.5-r1
 2110012311 metadata/md5-cache/dev-lang/R-4.1.0-r2
 2109240040 metadata/md5-cache/dev-lang/abs-2.5.0
@@ -37368,9 +37360,12 @@
 2112050639 metadata/md5-cache/dev-lang/swi-prolog-8.4.1
 2112050639 metadata/md5-cache/dev-lang/swi-prolog-8.5.1
 2112050639 metadata/md5-cache/dev-lang/swi-prolog-8.5.2
-2112060009 metadata/md5-cache/dev-lang/Manifest.gz
 2112060009 metadata/md5-cache/dev-lang/haxe-4.2.4-r2
 2112051939 metadata/md5-cache/dev-lang/neko-2.3.0-r1
+2112071240 metadata/md5-cache/dev-lang/Manifest.gz
+2112071240 metadata/md5-cache/dev-lang/python-3.10.1
+2112070210 metadata/md5-cache/dev-lang/rust-1.57.0
+2112070210 metadata/md5-cache/dev-lang/rust-bin-1.57.0
 2110291639 metadata/md5-cache/dev-libs/9libs-1.0-r4
 2109040224 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
 2111091344 metadata/md5-cache/dev-libs/aml-0.2.0
@@ -37740,7 +37735,6 @@
 2104060140 metadata/md5-cache/dev-libs/liblzw-0.2-r1
 2102190539 metadata/md5-cache/dev-libs/liblzw-0.3
 2109291109 metadata/md5-cache/dev-libs/libmaa-1.3.2
-2111112139 metadata/md5-cache/dev-libs/libmanette-0.2.6
 2109040224 metadata/md5-cache/dev-libs/libmaxminddb-1.5.2
 2109040224 metadata/md5-cache/dev-libs/libmaxminddb-1.6.0
 2110012311 metadata/md5-cache/dev-libs/libmaxminddb-9999
@@ -38170,7 +38164,6 @@
 2111112139 metadata/md5-cache/dev-libs/vala-common-0.54.3
 2110312244 metadata/md5-cache/dev-libs/vc-1.4.1-r1
 2110312244 metadata/md5-cache/dev-libs/vc-1.4.2
-2111091344 metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
 2111091344 metadata/md5-cache/dev-libs/voikko-fi-2.4
 2111091344 metadata/md5-cache/dev-libs/volume_key-0.3.12-r3
 2111091344 metadata/md5-cache/dev-libs/wayland-1.19.0
@@ -38236,7 +38229,6 @@
 2111272010 metadata/md5-cache/dev-libs/cppcodec-0.2
 2111272010 metadata/md5-cache/dev-libs/cppcodec-9999
 2111270010 metadata/md5-cache/dev-libs/libcbor-0.9.0
-2111280510 metadata/md5-cache/dev-libs/libphonenumber-8.12.37
 2111280340 metadata/md5-cache/dev-libs/libtpms-0.9.1
 2111271440 metadata/md5-cache/dev-libs/rinutils-0.10.0
 2111292010 metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -38281,7 +38273,6 @@
 2112012039 metadata/md5-cache/dev-libs/nss-3.73
 2112020309 metadata/md5-cache/dev-libs/userspace-rcu-0.13.0
 2112022010 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
-2112042239 metadata/md5-cache/dev-libs/boost-1.77.0-r4
 2112030809 metadata/md5-cache/dev-libs/botan-2.18.2-r1
 2112030809 metadata/md5-cache/dev-libs/libp11-0.4.11-r2
 2112031339 metadata/md5-cache/dev-libs/libxmlb-0.3.5
@@ -38290,15 +38281,18 @@
 2112040439 metadata/md5-cache/dev-libs/nss-3.68.1
 2112030809 metadata/md5-cache/dev-libs/pkcs11-helper-1.27.0-r1
 2112030809 metadata/md5-cache/dev-libs/softhsm-2.6.1-r2
-2112060110 metadata/md5-cache/dev-libs/Manifest.gz
-2112052339 metadata/md5-cache/dev-libs/boehm-gc-8.0.6
 2112052209 metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
-2112052139 metadata/md5-cache/dev-libs/girara-0.3.6
 2112060110 metadata/md5-cache/dev-libs/intel-compute-runtime-21.44.21506
 2112060110 metadata/md5-cache/dev-libs/intel-compute-runtime-21.48.21782
 2112052209 metadata/md5-cache/dev-libs/libofx-0.10.3
-2112060110 metadata/md5-cache/dev-libs/libthreadar-1.3.5
-2112052139 metadata/md5-cache/dev-libs/libwacom-1.12
+2112071310 metadata/md5-cache/dev-libs/Manifest.gz
+2112061839 metadata/md5-cache/dev-libs/boehm-gc-8.0.6
+2112061939 metadata/md5-cache/dev-libs/boost-1.77.0-r4
+2112061839 metadata/md5-cache/dev-libs/girara-0.3.6
+2112070009 metadata/md5-cache/dev-libs/libmanette-0.2.6
+2112070009 metadata/md5-cache/dev-libs/libphonenumber-8.12.37
+2112070940 metadata/md5-cache/dev-libs/libthreadar-1.3.5
+2112070539 metadata/md5-cache/dev-libs/libwacom-1.12
 2109040224 metadata/md5-cache/dev-lisp/alexandria-20171029
 2106291109 metadata/md5-cache/dev-lisp/asdf-3.1.5
 2109040224 metadata/md5-cache/dev-lisp/asdf-3.3.1
@@ -38507,7 +38501,6 @@
 2110152109 metadata/md5-cache/dev-ml/merlin-4.2
 2110171809 metadata/md5-cache/dev-ml/merlin-4.3.1
 2110150609 metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
-2110150609 metadata/md5-cache/dev-ml/merlin-extend-0.6
 2110031239 metadata/md5-cache/dev-ml/mirage-clock-3.1.0
 2110031239 metadata/md5-cache/dev-ml/mmap-1.1.0
 2106030409 metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -38710,9 +38703,11 @@
 2112040109 metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
 2112050639 metadata/md5-cache/dev-ml/ptmap-2.0.5-r1
 2112050639 metadata/md5-cache/dev-ml/sedlex-2.3-r1
-2112052209 metadata/md5-cache/dev-ml/Manifest.gz
 2112052209 metadata/md5-cache/dev-ml/fmt-0.9.0
 2112052139 metadata/md5-cache/dev-ml/ocaml-doc-4.05
+2112061340 metadata/md5-cache/dev-ml/Manifest.gz
+2112061340 metadata/md5-cache/dev-ml/fix-20211125
+2112061340 metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
 2109040224 metadata/md5-cache/dev-perl/Ace-1.920.0-r6
 2109022141 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
@@ -39924,14 +39919,10 @@
 2110160409 metadata/md5-cache/dev-perl/SOAP-Lite-1.260.0
 2110290909 metadata/md5-cache/dev-perl/SOAP-Lite-1.270.0
 2109022141 metadata/md5-cache/dev-perl/SOAP-WSDL-3.4.0
-2109022141 metadata/md5-cache/dev-perl/SQL-Abstract-1.840.0
 2110201239 metadata/md5-cache/dev-perl/SQL-Abstract-2.0.1
 2109022141 metadata/md5-cache/dev-perl/SQL-Abstract-Classic-1.910.0
-2109040224 metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.141.0-r1
 2109022141 metadata/md5-cache/dev-perl/SQL-Abstract-Limit-0.143.0
-2109022141 metadata/md5-cache/dev-perl/SQL-Statement-1.412.0
 2110260639 metadata/md5-cache/dev-perl/SQL-Statement-1.414.0
-2109022141 metadata/md5-cache/dev-perl/SQL-Translator-0.110.230
 2109022141 metadata/md5-cache/dev-perl/SQL-Translator-1.620.0
 2109022141 metadata/md5-cache/dev-perl/SRU-1.10.0-r1
 2109022141 metadata/md5-cache/dev-perl/SUPER-1.201.411.170
@@ -39985,17 +39976,13 @@
 2109022141 metadata/md5-cache/dev-perl/Statistics-Basic-1.661.100
 2109022141 metadata/md5-cache/dev-perl/Statistics-CaseResampling-0.150.0-r1
 2110312110 metadata/md5-cache/dev-perl/Statistics-ChiSquare-1.0.0
-2109022141 metadata/md5-cache/dev-perl/Statistics-Descriptive-3.61.200
 2110170109 metadata/md5-cache/dev-perl/Statistics-Descriptive-3.80.0
 2110121039 metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.120.0
-2109040224 metadata/md5-cache/dev-perl/Statistics-Descriptive-Discrete-0.70.0-r1
 2109022141 metadata/md5-cache/dev-perl/Statistics-Distributions-1.20.0-r2
 2109022141 metadata/md5-cache/dev-perl/Statistics-TTest-1.1.0-r2
 2109022141 metadata/md5-cache/dev-perl/Stream-Buffered-0.30.0-r1
 2109022141 metadata/md5-cache/dev-perl/String-Approx-3.280.0-r1
-2109022141 metadata/md5-cache/dev-perl/String-CRC32-1.600.0
 2110121039 metadata/md5-cache/dev-perl/String-CRC32-2.100.0
-2109022141 metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r2
 2110121039 metadata/md5-cache/dev-perl/String-Ediff-0.90.0-r3
 2109022141 metadata/md5-cache/dev-perl/String-Errf-0.8.0-r1
 2109022141 metadata/md5-cache/dev-perl/String-Escape-2010.2.0-r2
@@ -40035,7 +40022,6 @@
 2109022141 metadata/md5-cache/dev-perl/Syntax-Highlight-Engine-Simple-Perl-0.60.0
 2109022141 metadata/md5-cache/dev-perl/Syntax-Keyword-Junction-0.3.8-r2
 2109040224 metadata/md5-cache/dev-perl/Sys-CPU-0.610.0
-2109022141 metadata/md5-cache/dev-perl/Sys-CPU-0.610.0-r1
 2109022141 metadata/md5-cache/dev-perl/Sys-CpuLoad-0.30.0
 2110240639 metadata/md5-cache/dev-perl/Sys-CpuLoad-0.310.0-r2
 2109022141 metadata/md5-cache/dev-perl/Sys-Hostname-Long-1.500.0-r2
@@ -40195,7 +40181,6 @@
 2109171109 metadata/md5-cache/dev-perl/Text-Autoformat-1.740.0
 2110260439 metadata/md5-cache/dev-perl/Text-BibTeX-0.880.0-r1
 2109022141 metadata/md5-cache/dev-perl/Text-CSV-1.950.0
-2110260439 metadata/md5-cache/dev-perl/Text-CSV-2.10.0
 2109232339 metadata/md5-cache/dev-perl/Text-CSV-Simple-1.0.0-r2
 2109022141 metadata/md5-cache/dev-perl/Text-CSV_XS-1.340.0
 2109232339 metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r2
@@ -40342,7 +40327,6 @@
 2109211710 metadata/md5-cache/dev-perl/X11-XCB-0.180.0
 2110040209 metadata/md5-cache/dev-perl/X500-DN-0.290.0-r2
 2109022141 metadata/md5-cache/dev-perl/XML-Atom-0.420.0
-2110040209 metadata/md5-cache/dev-perl/XML-Atom-0.430.0
 2110040209 metadata/md5-cache/dev-perl/XML-Catalog-1.30.0-r2
 2110040209 metadata/md5-cache/dev-perl/XML-CompactTree-XS-0.30.0-r1
 2109022141 metadata/md5-cache/dev-perl/XML-Compile-1.600.0
@@ -40557,7 +40541,6 @@
 2111210809 metadata/md5-cache/dev-perl/strictures-2.0.6
 2111211439 metadata/md5-cache/dev-perl/Net-DNS-SEC-1.190.0
 2111211439 metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r3
-2111221539 metadata/md5-cache/dev-perl/Proc-ProcessTable-0.634.0
 2111222239 metadata/md5-cache/dev-perl/MooX-late-0.100.0
 2111222239 metadata/md5-cache/dev-perl/Sub-HandlesVia-0.16.0
 2111250440 metadata/md5-cache/dev-perl/PDF-API2-2.42.0
@@ -40574,24 +40557,13 @@
 2112020609 metadata/md5-cache/dev-perl/Data-Validate-IP-0.300.0
 2112020609 metadata/md5-cache/dev-perl/Digest-SHA1-2.130.0-r2
 2112020609 metadata/md5-cache/dev-perl/NetAddr-IP-4.79.0-r1
-2112050639 metadata/md5-cache/dev-perl/Alien-Build-2.420.0
 2112050609 metadata/md5-cache/dev-perl/App-Cmd-0.334.0
-2112050639 metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
-2112050639 metadata/md5-cache/dev-perl/CGI-4.530.0
 2112050639 metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.109.200
-2112050639 metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
 2112050609 metadata/md5-cache/dev-perl/Config-INI-0.27.0
 2112050609 metadata/md5-cache/dev-perl/Config-MVP-Reader-INI-2.101.464
-2112050639 metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
-2112050639 metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
-2112050639 metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
-2112050639 metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
 2112050639 metadata/md5-cache/dev-perl/DBIx-SearchBuilder-1.710.0
 2112050609 metadata/md5-cache/dev-perl/Data-GUID-0.50.0
-2112050639 metadata/md5-cache/dev-perl/Data-OptList-0.112.0
 2112050609 metadata/md5-cache/dev-perl/DateTime-Calendar-Julian-0.106.0
-2112050639 metadata/md5-cache/dev-perl/DateTime-TimeZone-2.500.0
-2112050639 metadata/md5-cache/dev-perl/Devel-CheckOS-1.870.0
 2112050639 metadata/md5-cache/dev-perl/Devel-NYTProf-6.110.0
 2112041339 metadata/md5-cache/dev-perl/Digest-MD2-2.40.0-r1
 2112041339 metadata/md5-cache/dev-perl/Digest-SHA3-1.40.0
@@ -40600,13 +40572,11 @@
 2112050709 metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
 2112050639 metadata/md5-cache/dev-perl/Email-Sender-2.500.0
 2112050639 metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.230.0
-2112050639 metadata/md5-cache/dev-perl/File-BaseDir-0.90.0
 2112050639 metadata/md5-cache/dev-perl/HTML-FillInForm-2.220.0
 2112050639 metadata/md5-cache/dev-perl/HTML-TableContentParser-0.305.0
 2112050639 metadata/md5-cache/dev-perl/HTTP-BrowserDetect-3.350.0
 2112050639 metadata/md5-cache/dev-perl/IO-AIO-4.760.0
 2112050639 metadata/md5-cache/dev-perl/Sub-Exporter-ForMethods-0.100.54
-2112050709 metadata/md5-cache/dev-perl/Template-Toolkit-3.9.0
 2112050639 metadata/md5-cache/dev-perl/Test-NoTabs-2.20.0
 2112050709 metadata/md5-cache/dev-perl/Test-Portability-Files-0.100.0
 2112050709 metadata/md5-cache/dev-perl/Test-TempDir-Tiny-0.18.0
@@ -40625,7 +40595,6 @@
 2112050809 metadata/md5-cache/dev-perl/gtk2-trayicon-0.70.0
 2112060009 metadata/md5-cache/dev-perl/AtExit-2.50.0
 2112060009 metadata/md5-cache/dev-perl/Carp-Assert-More-2.0.1
-2112060110 metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
 2112060009 metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.320.0
 2112060009 metadata/md5-cache/dev-perl/Curses-1.380.0
 2112060110 metadata/md5-cache/dev-perl/Data-Dump-1.250.0
@@ -40636,8 +40605,6 @@
 2112060009 metadata/md5-cache/dev-perl/Graph-0.972.500
 2112060009 metadata/md5-cache/dev-perl/HTTP-Message-6.330.0
 2112060339 metadata/md5-cache/dev-perl/IO-Socket-SSL-2.72.0
-2112060609 metadata/md5-cache/dev-perl/Manifest.gz
-2112051709 metadata/md5-cache/dev-perl/Mouse-2.5.10
 2112060140 metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.4-r1
 2112051109 metadata/md5-cache/dev-perl/Sys-Virt-7.5.0
 2112060339 metadata/md5-cache/dev-perl/Test-MockModule-0.176.0
@@ -40650,7 +40617,6 @@
 2112060339 metadata/md5-cache/dev-perl/Test-Script-1.290.0
 2112060009 metadata/md5-cache/dev-perl/Test-TCP-2.220.0
 2112060339 metadata/md5-cache/dev-perl/Test-Time-0.80.0
-2112060609 metadata/md5-cache/dev-perl/Test-Trap-0.3.4
 2112060339 metadata/md5-cache/dev-perl/Test-Warn-0.360.0
 2112060339 metadata/md5-cache/dev-perl/Test-Warnings-0.31.0
 2112060339 metadata/md5-cache/dev-perl/Test-YAML-1.70.0
@@ -40682,6 +40648,29 @@
 2112060339 metadata/md5-cache/dev-perl/YAML-1.300.0
 2112060439 metadata/md5-cache/dev-perl/YAML-LibYAML-0.830.0
 2112060339 metadata/md5-cache/dev-perl/YAML-Syck-1.340.0
+2112062309 metadata/md5-cache/dev-perl/Alien-Build-2.420.0
+2112061009 metadata/md5-cache/dev-perl/Archive-Extract-0.880.0
+2112061139 metadata/md5-cache/dev-perl/CGI-4.530.0
+2112061009 metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.90.0
+2112070940 metadata/md5-cache/dev-perl/Class-XSAccessor-1.190.0-r1
+2112061009 metadata/md5-cache/dev-perl/Config-Tiny-2.270.0
+2112061009 metadata/md5-cache/dev-perl/Convert-ASN1-0.330.0
+2112061009 metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
+2112061009 metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
+2112061139 metadata/md5-cache/dev-perl/Data-OptList-0.112.0
+2112061139 metadata/md5-cache/dev-perl/DateTime-TimeZone-2.500.0
+2112061009 metadata/md5-cache/dev-perl/Devel-CheckOS-1.870.0
+2112061009 metadata/md5-cache/dev-perl/File-BaseDir-0.90.0
+2112071039 metadata/md5-cache/dev-perl/Manifest.gz
+2112070940 metadata/md5-cache/dev-perl/Mouse-2.5.10
+2112062309 metadata/md5-cache/dev-perl/Proc-ProcessTable-0.634.0
+2112061840 metadata/md5-cache/dev-perl/Spreadsheet-XLSX-0.170.0
+2112061840 metadata/md5-cache/dev-perl/String-Formatter-1.234.0
+2112071039 metadata/md5-cache/dev-perl/Sys-CPU-0.610.0-r1
+2112070940 metadata/md5-cache/dev-perl/Template-Toolkit-3.9.0
+2112070940 metadata/md5-cache/dev-perl/Test-Trap-0.3.4
+2112070940 metadata/md5-cache/dev-perl/Text-CSV-2.10.0
+2112061039 metadata/md5-cache/dev-perl/XML-Atom-0.430.0
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2003261841 metadata/md5-cache/dev-php/File_Iterator-1.4.3
 2003261841 metadata/md5-cache/dev-php/File_Iterator-2.0.2
@@ -41024,7 +41013,6 @@
 2111250010 metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc2
 2111250010 metadata/md5-cache/dev-php/pecl-eio-3.0.0_rc4
 2111250010 metadata/md5-cache/dev-php/pecl-event-2.5.7
-2111250010 metadata/md5-cache/dev-php/pecl-event-3.0.2_p1
 2111250010 metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r4
 2111250010 metadata/md5-cache/dev-php/pecl-geoip-1.1.1-r5
 2111250010 metadata/md5-cache/dev-php/pecl-gnupg-1.5.0
@@ -41101,8 +41089,9 @@
 2111250010 metadata/md5-cache/dev-php/xhprof-2.1.4
 2111250010 metadata/md5-cache/dev-php/xhprof-2.2.3
 2111250010 metadata/md5-cache/dev-php/xhprof-2.3.5
-2111290309 metadata/md5-cache/dev-php/Manifest.gz
 2111290309 metadata/md5-cache/dev-php/pecl-mongodb-1.10.0
+2112061439 metadata/md5-cache/dev-php/Manifest.gz
+2112061439 metadata/md5-cache/dev-php/pecl-event-3.0.2_p1
 2111091344 metadata/md5-cache/dev-python/3to2-1.1.1-r1
 2111091344 metadata/md5-cache/dev-python/APScheduler-3.8.1
 2111091344 metadata/md5-cache/dev-python/Babel-2.9.1
@@ -41171,7 +41160,6 @@
 2111091344 metadata/md5-cache/dev-python/arpeggio-1.10.2
 2111091344 metadata/md5-cache/dev-python/asn1crypto-1.4.0
 2111091344 metadata/md5-cache/dev-python/asteval-0.9.25
-2111091344 metadata/md5-cache/dev-python/astroid-2.7.3-r1
 2111122309 metadata/md5-cache/dev-python/astroid-2.8.5
 2111091344 metadata/md5-cache/dev-python/asttokens-2.0.5
 2111091344 metadata/md5-cache/dev-python/async-lru-1.0.2_p20201029
@@ -41626,7 +41614,6 @@
 2111180910 metadata/md5-cache/dev-python/isodate-0.6.0-r2
 2111180910 metadata/md5-cache/dev-python/isoduration-20.11.0
 2111091344 metadata/md5-cache/dev-python/isort-5.10.0
-2111091344 metadata/md5-cache/dev-python/isort-5.10.1
 2111171109 metadata/md5-cache/dev-python/isort-5.9.3
 2111091344 metadata/md5-cache/dev-python/itsdangerous-1.1.0-r1
 2111091344 metadata/md5-cache/dev-python/itsdangerous-2.0.1
@@ -41807,8 +41794,6 @@
 2111091344 metadata/md5-cache/dev-python/munch-2.5.0-r1
 2111091344 metadata/md5-cache/dev-python/munkres-1.1.4
 2111091344 metadata/md5-cache/dev-python/mygpoclient-1.8
-2111171109 metadata/md5-cache/dev-python/mypy-0.910-r1
-2111091344 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
 2111091344 metadata/md5-cache/dev-python/mysql-connector-python-8.0.26
 2111140710 metadata/md5-cache/dev-python/mysql-connector-python-8.0.27
 2111091344 metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
@@ -41823,7 +41808,6 @@
 2111091344 metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
 2111091344 metadata/md5-cache/dev-python/namespace-zope-1-r1
 2111091344 metadata/md5-cache/dev-python/natsort-7.1.1
-2111091344 metadata/md5-cache/dev-python/natsort-7.2.0
 2111091344 metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1
 2111091344 metadata/md5-cache/dev-python/nbclassic-0.3.3
 2111181139 metadata/md5-cache/dev-python/nbclient-0.5.4
@@ -42040,7 +42024,6 @@
 2111181539 metadata/md5-cache/dev-python/pydecomp-0.3-r2
 2111091344 metadata/md5-cache/dev-python/pydecomp-9999
 2111091344 metadata/md5-cache/dev-python/pydispatcher-2.1.2
-2111091344 metadata/md5-cache/dev-python/pydocstyle-6.1.1
 2111091344 metadata/md5-cache/dev-python/pydotplus-2.0.2
 2111091344 metadata/md5-cache/dev-python/pydyf-0.1.2
 2111091344 metadata/md5-cache/dev-python/pyelftools-0.27
@@ -42573,8 +42556,6 @@
 2111091344 metadata/md5-cache/dev-python/thrift-0.14.1
 2111091344 metadata/md5-cache/dev-python/thriftpy2-0.4.14
 2111091344 metadata/md5-cache/dev-python/thunarx-python-0.5.2
-2111091344 metadata/md5-cache/dev-python/tikzplotlib-0.9.13
-2111091344 metadata/md5-cache/dev-python/tikzplotlib-0.9.15
 2111091344 metadata/md5-cache/dev-python/tinycss-0.4
 2111091344 metadata/md5-cache/dev-python/tld-0.12.6
 2111091344 metadata/md5-cache/dev-python/tldextract-3.1.2
@@ -42674,7 +42655,6 @@
 2111091344 metadata/md5-cache/dev-python/whoosh-2.7.4-r1
 2111181139 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1-r1
 2111091344 metadata/md5-cache/dev-python/wrapt-1.12.1
-2111100139 metadata/md5-cache/dev-python/wrapt-1.13.2
 2111091344 metadata/md5-cache/dev-python/ws4py-0.5.1-r1
 2111091344 metadata/md5-cache/dev-python/ws4py-9999
 2111091344 metadata/md5-cache/dev-python/wsaccel-0.6.3
@@ -42815,7 +42795,6 @@
 2111220639 metadata/md5-cache/dev-python/aesara-2.2.6
 2111212309 metadata/md5-cache/dev-python/astroid-2.8.4
 2111220139 metadata/md5-cache/dev-python/astroid-2.8.6
-2111220139 metadata/md5-cache/dev-python/astroid-2.9.0
 2111212309 metadata/md5-cache/dev-python/backrefs-5.2
 2111220639 metadata/md5-cache/dev-python/furo-2021.10.9
 2111220139 metadata/md5-cache/dev-python/markups-3.1.3
@@ -42980,7 +42959,6 @@
 2111270940 metadata/md5-cache/dev-python/simpleeval-0.9.11
 2111280040 metadata/md5-cache/dev-python/sphinx-4.3.1
 2111270940 metadata/md5-cache/dev-python/suds-1.0.0
-2111262339 metadata/md5-cache/dev-python/tomli-1.2.2-r1
 2111271710 metadata/md5-cache/dev-python/trio-0.19.0
 2111281610 metadata/md5-cache/dev-python/trio-asyncio-0.12.0
 2111281810 metadata/md5-cache/dev-python/trustme-0.9.0
@@ -43060,7 +43038,6 @@
 2112020739 metadata/md5-cache/dev-python/patatt-0.4.9
 2112021209 metadata/md5-cache/dev-python/phonenumbers-8.12.37
 2112021209 metadata/md5-cache/dev-python/pikepdf-4.0.2
-2112010139 metadata/md5-cache/dev-python/pip-21.3.1-r1
 2112021139 metadata/md5-cache/dev-python/pkginfo-1.8.2
 2112012239 metadata/md5-cache/dev-python/pytest-django-4.5.0
 2112021209 metadata/md5-cache/dev-python/python-dbusmock-0.24.1
@@ -43073,7 +43050,6 @@
 2112021209 metadata/md5-cache/dev-python/sybil-3.0.0
 2112021209 metadata/md5-cache/dev-python/textdistance-4.2.2
 2112010139 metadata/md5-cache/dev-python/tomli-w-0.4.0
-2112021139 metadata/md5-cache/dev-python/tomli-w-1.0.0
 2112012239 metadata/md5-cache/dev-python/twine-3.7.0
 2112022309 metadata/md5-cache/dev-python/urwid-2.1.2
 2112021209 metadata/md5-cache/dev-python/xlsxwriter-3.0.2
@@ -43116,15 +43092,12 @@
 2112032309 metadata/md5-cache/dev-python/openstacksdk-0.61.0
 2112040709 metadata/md5-cache/dev-python/packaging-21.3-r1
 2112031109 metadata/md5-cache/dev-python/peewee-3.14.8
-2112042239 metadata/md5-cache/dev-python/pillow-8.4.0
 2112031709 metadata/md5-cache/dev-python/precis-i18n-1.0.3
 2112050139 metadata/md5-cache/dev-python/pycryptodome-3.12.0
 2112041209 metadata/md5-cache/dev-python/pydantic-1.8.2_p20210719
 2112030839 metadata/md5-cache/dev-python/pydot-1.4.2-r1
 2112031109 metadata/md5-cache/dev-python/pyicu-2.8
-2112032309 metadata/md5-cache/dev-python/pylama-8.3.3
 2112031239 metadata/md5-cache/dev-python/pylint-2.12.1
-2112040909 metadata/md5-cache/dev-python/pylint-2.12.2
 2112030239 metadata/md5-cache/dev-python/pytest-django-4.5.1
 2112040539 metadata/md5-cache/dev-python/pytest-salt-factories-0.911.0
 2112041209 metadata/md5-cache/dev-python/pytest-toolbox-0.4
@@ -43151,12 +43124,43 @@
 2112042109 metadata/md5-cache/dev-python/werkzeug-2.0.2
 2112040009 metadata/md5-cache/dev-python/wsproto-1.0.0
 2112031109 metadata/md5-cache/dev-python/zstd-1.5.0.4
-2112060439 metadata/md5-cache/dev-python/Manifest.gz
 2112060439 metadata/md5-cache/dev-python/cython-0.29.25
 2112060110 metadata/md5-cache/dev-python/django-cors-headers-3.10.1
 2112060110 metadata/md5-cache/dev-python/hypothesis-6.30.1
 2112060110 metadata/md5-cache/dev-python/mistune-2.0.0
 2112060110 metadata/md5-cache/dev-python/setuptools-59.5.0
+2112071409 metadata/md5-cache/dev-python/Manifest.gz
+2112071209 metadata/md5-cache/dev-python/astroid-2.7.3-r1
+2112071209 metadata/md5-cache/dev-python/astroid-2.9.0
+2112061009 metadata/md5-cache/dev-python/black-21.12_beta0
+2112070240 metadata/md5-cache/dev-python/boto3-1.20.21
+2112070240 metadata/md5-cache/dev-python/botocore-1.23.21
+2112061009 metadata/md5-cache/dev-python/cattrs-1.9.0
+2112071240 metadata/md5-cache/dev-python/django-2.2.25
+2112071240 metadata/md5-cache/dev-python/django-3.1.14
+2112071240 metadata/md5-cache/dev-python/django-3.2.10
+2112071240 metadata/md5-cache/dev-python/imageio-2.13.2
+2112071209 metadata/md5-cache/dev-python/isort-5.10.1
+2112071409 metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2
+2112071409 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.11
+2112071409 metadata/md5-cache/dev-python/mkdocs-material-8.0.5
+2112071209 metadata/md5-cache/dev-python/mypy-0.910-r1
+2112071209 metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+2112071209 metadata/md5-cache/dev-python/natsort-7.2.0
+2112070240 metadata/md5-cache/dev-python/nuitka-0.6.18.1
+2112062210 metadata/md5-cache/dev-python/pillow-8.4.0
+2112071009 metadata/md5-cache/dev-python/pip-21.3.1-r1
+2112071009 metadata/md5-cache/dev-python/pyalsa-1.2.6
+2112071209 metadata/md5-cache/dev-python/pydocstyle-6.1.1
+2112071209 metadata/md5-cache/dev-python/pylama-8.3.3
+2112071209 metadata/md5-cache/dev-python/pylint-2.12.2
+2112071409 metadata/md5-cache/dev-python/qdarkstyle-3.0.3
+2112071339 metadata/md5-cache/dev-python/tikzplotlib-0.9.16
+2112071409 metadata/md5-cache/dev-python/tomli-1.2.2-r1
+2112071009 metadata/md5-cache/dev-python/tomli-w-1.0.0
+2112071240 metadata/md5-cache/dev-python/websocket-client-1.2.2
+2112071209 metadata/md5-cache/dev-python/wrapt-1.13.2
+2112070240 metadata/md5-cache/dev-python/yamlpath-3.6.4
 2109082009 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2110170409 metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r1
 2110170409 metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1
@@ -44725,7 +44729,6 @@
 2111252140 metadata/md5-cache/dev-ruby/execjs-2.8.1
 2111251540 metadata/md5-cache/dev-ruby/exifr-1.3.8
 2111251540 metadata/md5-cache/dev-ruby/exifr-1.3.9
-2111241010 metadata/md5-cache/dev-ruby/facter-3.14.19
 2111241010 metadata/md5-cache/dev-ruby/facter-3.14.20
 2111251540 metadata/md5-cache/dev-ruby/fakefs-1.2.3
 2111251540 metadata/md5-cache/dev-ruby/fakefs-1.3.2
@@ -45148,8 +45151,6 @@
 2111251540 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
 2111251540 metadata/md5-cache/dev-ruby/regexp_parser-2.1.1
 2111251540 metadata/md5-cache/dev-ruby/regexp_parser-2.1.1-r1
-2111251540 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0
-2111251540 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0-r1
 2111251540 metadata/md5-cache/dev-ruby/request_store-1.5.0
 2111251540 metadata/md5-cache/dev-ruby/rest-client-2.1.0
 2111251540 metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -45282,12 +45283,8 @@
 2111251540 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
 2111251540 metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
 2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
-2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.15.0
-2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.15.1
-2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.16.0
 2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.17.0
 2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.18.0
-2111251540 metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
 2111251540 metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
 2111241010 metadata/md5-cache/dev-ruby/rubygems-3.0.3
 2111241010 metadata/md5-cache/dev-ruby/rubygems-3.0.9
@@ -45340,10 +45337,7 @@
 2111251540 metadata/md5-cache/dev-ruby/set-1.0.2
 2111251540 metadata/md5-cache/dev-ruby/settingslogic-2.0.9-r1
 2111251540 metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
-2111251540 metadata/md5-cache/dev-ruby/sexp_processor-4.15.1
-2111251540 metadata/md5-cache/dev-ruby/sexp_processor-4.15.2
 2111251540 metadata/md5-cache/dev-ruby/sexp_processor-4.15.3
-2111251540 metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
 2111251540 metadata/md5-cache/dev-ruby/shoulda-2.11.3-r3
 2111251540 metadata/md5-cache/dev-ruby/shoulda-3.6.0-r1
 2111251540 metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
@@ -45573,8 +45567,14 @@
 2112011639 metadata/md5-cache/dev-ruby/xmlrpc-0.3.2-r1
 2112041009 metadata/md5-cache/dev-ruby/ruby-shadow-2.5.1
 2112041839 metadata/md5-cache/dev-ruby/webrick-1.7.0
-2112051039 metadata/md5-cache/dev-ruby/Manifest.gz
 2112051039 metadata/md5-cache/dev-ruby/regexp_parser-2.2.0
+2112071009 metadata/md5-cache/dev-ruby/Manifest.gz
+2112071009 metadata/md5-cache/dev-ruby/arel-helpers-2.13.0
+2112071009 metadata/md5-cache/dev-ruby/regexp_property_values-1.0.0-r1
+2112071009 metadata/md5-cache/dev-ruby/regexp_property_values-1.1.0
+2112071009 metadata/md5-cache/dev-ruby/rr-3.0.9
+2112070940 metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
+2112070940 metadata/md5-cache/dev-ruby/sexp_processor-4.16.0
 2111121539 metadata/md5-cache/dev-scheme/c-wrapper-0.6.1-r2
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111121539 metadata/md5-cache/dev-scheme/escm-1.1-r1
@@ -45735,11 +45735,11 @@
 2110120139 metadata/md5-cache/dev-tex/tth-4.08
 2002141709 metadata/md5-cache/dev-tex/vc-0.6
 2111242309 metadata/md5-cache/dev-tex/html2latex-1.1-r3
-2112021239 metadata/md5-cache/dev-tex/latex2html-2021.2-r2
 2112022010 metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
 2112022010 metadata/md5-cache/dev-tex/tex4ht-20090611_p1038_p20210603
-2112052139 metadata/md5-cache/dev-tex/Manifest.gz
 2112052139 metadata/md5-cache/dev-tex/latex-beamer-3.63
+2112071110 metadata/md5-cache/dev-tex/Manifest.gz
+2112071110 metadata/md5-cache/dev-tex/latex2html-2021.2-r2
 2110310609 metadata/md5-cache/dev-texlive/Manifest.gz
 2107021539 metadata/md5-cache/dev-texlive/texlive-basic-2021
 2107151340 metadata/md5-cache/dev-texlive/texlive-bibtexextra-2021
@@ -45972,7 +45972,6 @@
 2110312244 metadata/md5-cache/dev-util/codeblocks-20.03-r1
 2110312244 metadata/md5-cache/dev-util/codeblocks-20.03-r2
 2110312244 metadata/md5-cache/dev-util/codeblocks-20.03-r3
-2111021410 metadata/md5-cache/dev-util/codeblocks-20.03-r4
 2110312244 metadata/md5-cache/dev-util/codeblocks-9999
 2111091344 metadata/md5-cache/dev-util/codespell-2.1.0
 2104060140 metadata/md5-cache/dev-util/colm-0.13.0.7
@@ -46390,7 +46389,6 @@
 2109040224 metadata/md5-cache/dev-util/statifier-1.7.4-r1
 2109031439 metadata/md5-cache/dev-util/stepman-0.10.5
 2110030139 metadata/md5-cache/dev-util/strace-5.12-r1
-2110030139 metadata/md5-cache/dev-util/strace-5.14-r1
 2110030139 metadata/md5-cache/dev-util/strace-9999
 2109040224 metadata/md5-cache/dev-util/stressapptest-1.0.9
 2111140039 metadata/md5-cache/dev-util/stripe-mock-0.113.0
@@ -46548,7 +46546,6 @@
 2111292010 metadata/md5-cache/dev-util/kdevelop-python-21.11.90
 2111292010 metadata/md5-cache/dev-util/kdevelop-python-5.6.2
 2111292010 metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
-2111291809 metadata/md5-cache/dev-util/maturin-0.12.3
 2111300239 metadata/md5-cache/dev-util/spirv-headers-1.2.198
 2111300239 metadata/md5-cache/dev-util/spirv-tools-1.2.198
 2111300239 metadata/md5-cache/dev-util/spirv-tools-99999999
@@ -46588,16 +46585,22 @@
 2112050709 metadata/md5-cache/dev-util/maxcso-1.13.0
 2112050709 metadata/md5-cache/dev-util/maxcso-9999
 2112042009 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.5.1-r1
-2112060439 metadata/md5-cache/dev-util/Manifest.gz
 2112052139 metadata/md5-cache/dev-util/checkbashisms-2.21.4
-2112060009 metadata/md5-cache/dev-util/cppunit-1.15.1-r3
 2112051939 metadata/md5-cache/dev-util/glslang-1.2.198
 2112051939 metadata/md5-cache/dev-util/glslang-11.6.0
 2112051939 metadata/md5-cache/dev-util/glslang-9999
 2112060110 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.9441
 2112060009 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.2.89-r4
-2112060439 metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
 2112051109 metadata/md5-cache/dev-util/tup-0.7.10
+2112071110 metadata/md5-cache/dev-util/Manifest.gz
+2112061439 metadata/md5-cache/dev-util/codeblocks-20.03-r4
+2112061840 metadata/md5-cache/dev-util/cppunit-1.15.1-r3
+2112071110 metadata/md5-cache/dev-util/diffoscope-195
+2112071110 metadata/md5-cache/dev-util/git-delta-0.11.1
+2112061139 metadata/md5-cache/dev-util/include-what-you-use-0.17
+2112070039 metadata/md5-cache/dev-util/maturin-0.12.4
+2112061840 metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
+2112071110 metadata/md5-cache/dev-util/strace-5.14-r1
 2111091344 metadata/md5-cache/dev-vcs/breezy-3.2.1-r1
 2106291109 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
@@ -46616,11 +46619,6 @@
 2109040224 metadata/md5-cache/dev-vcs/fossil-2.16-r1
 2111140640 metadata/md5-cache/dev-vcs/git-2.32.0-r1
 2111091344 metadata/md5-cache/dev-vcs/git-2.33.1
-2111152110 metadata/md5-cache/dev-vcs/git-2.34.0
-2111091344 metadata/md5-cache/dev-vcs/git-9999
-2111091344 metadata/md5-cache/dev-vcs/git-9999-r1
-2111091344 metadata/md5-cache/dev-vcs/git-9999-r2
-2111091344 metadata/md5-cache/dev-vcs/git-9999-r3
 2109111011 metadata/md5-cache/dev-vcs/git-annex-8.20200810
 2111091344 metadata/md5-cache/dev-vcs/git-big-picture-1.0.0
 2111091344 metadata/md5-cache/dev-vcs/git-big-picture-1.1.1
@@ -46713,8 +46711,13 @@
 2111292010 metadata/md5-cache/dev-vcs/kdesvn-2.1.0
 2112022010 metadata/md5-cache/dev-vcs/bfg-1.13.0
 2112022010 metadata/md5-cache/dev-vcs/subversion-1.14.1
-2112050839 metadata/md5-cache/dev-vcs/Manifest.gz
-2112050839 metadata/md5-cache/dev-vcs/git-cola-3.10.1
+2112070940 metadata/md5-cache/dev-vcs/Manifest.gz
+2112061209 metadata/md5-cache/dev-vcs/git-2.34.1-r1
+2112061209 metadata/md5-cache/dev-vcs/git-9999
+2112061209 metadata/md5-cache/dev-vcs/git-9999-r1
+2112061209 metadata/md5-cache/dev-vcs/git-9999-r2
+2112061209 metadata/md5-cache/dev-vcs/git-9999-r3
+2112070940 metadata/md5-cache/dev-vcs/git-cola-3.10.1
 2110012311 metadata/md5-cache/games-action/0verkill-0.16-r4
 2110312244 metadata/md5-cache/games-action/abuse-0.9.0
 2110312244 metadata/md5-cache/games-action/abuse-0.9_p20181213-r1
@@ -46997,8 +47000,8 @@
 2112022010 metadata/md5-cache/games-board/domination-1.1.1.6-r2
 2112022010 metadata/md5-cache/games-board/megamek-0.34.10-r2
 2112041709 metadata/md5-cache/games-board/gnubg-1.06.002-r3
-2112060339 metadata/md5-cache/games-board/Manifest.gz
-2112060339 metadata/md5-cache/games-board/gnuchess-6.2.9
+2112061840 metadata/md5-cache/games-board/Manifest.gz
+2112061840 metadata/md5-cache/games-board/gnuchess-6.2.9
 2110012311 metadata/md5-cache/games-emulation/advancemame-3.9
 2110012311 metadata/md5-cache/games-emulation/advancescan-1.16-r1
 2110012311 metadata/md5-cache/games-emulation/atari800-4.2.0-r1
@@ -47097,7 +47100,6 @@
 2110312244 metadata/md5-cache/games-engines/love-11.3-r100
 2110312244 metadata/md5-cache/games-engines/love-9999
 2106210056 metadata/md5-cache/games-engines/nazghul-0.7.1-r1
-2110312244 metadata/md5-cache/games-engines/openmw-0.46.0-r2
 2110312244 metadata/md5-cache/games-engines/openmw-9999
 2110312244 metadata/md5-cache/games-engines/openxcom-1.0.0_p20180317-r1
 2110312244 metadata/md5-cache/games-engines/openxcom-9999
@@ -47120,8 +47122,8 @@
 2111201609 metadata/md5-cache/games-engines/openmw-0.47.0-r1
 2111221639 metadata/md5-cache/games-engines/scummvm-2.5.0
 2111221639 metadata/md5-cache/games-engines/scummvm-9999
-2112031609 metadata/md5-cache/games-engines/Manifest.gz
 2112031609 metadata/md5-cache/games-engines/odamex-0.9.5
+2112061409 metadata/md5-cache/games-engines/Manifest.gz
 2110312244 metadata/md5-cache/games-fps/alienarena-7.66
 2110312244 metadata/md5-cache/games-fps/avp-20150214-r1
 2109040224 metadata/md5-cache/games-fps/blackshades-20070723-r1
@@ -47255,9 +47257,9 @@
 2112040609 metadata/md5-cache/games-misc/fortune-mod-scriptures-1.1.0
 2112040410 metadata/md5-cache/games-misc/fortune-mod-tao-1-r1
 2112040609 metadata/md5-cache/games-misc/fortune-mod-taow-1.0
-2112060609 metadata/md5-cache/games-misc/Manifest.gz
-2112060609 metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
-2112060609 metadata/md5-cache/games-misc/fortune-mod-all-5
+2112070940 metadata/md5-cache/games-misc/Manifest.gz
+2112070940 metadata/md5-cache/games-misc/fortune-mod-3.6.1-r1
+2112070940 metadata/md5-cache/games-misc/fortune-mod-all-5
 2111091344 metadata/md5-cache/games-mud/Manifest.gz
 2109040224 metadata/md5-cache/games-mud/circlemud-3.1-r2
 2110012311 metadata/md5-cache/games-mud/crystal-0.2.4-r1
@@ -47332,7 +47334,6 @@
 2110012311 metadata/md5-cache/games-puzzle/nudoku-2.1.0
 2110312244 metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
 2110312244 metadata/md5-cache/games-puzzle/numptyphysics-9999
-2111140410 metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
 2102241843 metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
 2109040224 metadata/md5-cache/games-puzzle/picpuz-2.5-r1
 2111091344 metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
@@ -47375,8 +47376,9 @@
 2110312244 metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
 2111292010 metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20210905
 2111292010 metadata/md5-cache/games-puzzle/ksokoban-9999
-2112022010 metadata/md5-cache/games-puzzle/Manifest.gz
 2112022010 metadata/md5-cache/games-puzzle/pauker-1.8-r2
+2112070410 metadata/md5-cache/games-puzzle/Manifest.gz
+2112070410 metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
 2104100939 metadata/md5-cache/games-roguelike/FTL-1.5.13-r1
 2109040224 metadata/md5-cache/games-roguelike/FTL-gog-1.6.9.25330
 2104040939 metadata/md5-cache/games-roguelike/adom-1.1.1-r2
@@ -47838,8 +47840,9 @@
 2111071139 metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r2
 2109040224 metadata/md5-cache/gnustep-apps/zipper-1.5
 2111071139 metadata/md5-cache/gnustep-apps/zipper-1.5-r1
-2111300209 metadata/md5-cache/gnustep-apps/Manifest.gz
 2111300209 metadata/md5-cache/gnustep-apps/gnumail-1.3.0
+2112061639 metadata/md5-cache/gnustep-apps/Manifest.gz
+2112061639 metadata/md5-cache/gnustep-apps/gworkspace-0.9.4-r1
 2110312244 metadata/md5-cache/gnustep-base/Manifest.gz
 2109040224 metadata/md5-cache/gnustep-base/gnustep-back-art-0.28.0
 2109040224 metadata/md5-cache/gnustep-base/gnustep-back-art-0.29.0
@@ -47940,7 +47943,6 @@
 2111120439 metadata/md5-cache/gui-libs/gtk-layer-shell-0.6.0
 2111112139 metadata/md5-cache/gui-libs/libhandy-1.2.3
 2111112139 metadata/md5-cache/gui-libs/libhandy-1.4.0
-2111091344 metadata/md5-cache/gui-libs/libwpe-1.10.1-r1
 2111091344 metadata/md5-cache/gui-libs/neatvnc-0.4.0
 2111091344 metadata/md5-cache/gui-libs/neatvnc-9999
 2111091344 metadata/md5-cache/gui-libs/tepl-5.0.1-r1
@@ -47951,12 +47953,13 @@
 2111091344 metadata/md5-cache/gui-libs/wf-config-9999
 2111091344 metadata/md5-cache/gui-libs/wlroots-0.14.0-r2
 2111091344 metadata/md5-cache/gui-libs/wlroots-0.14.1-r1
-2111091344 metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
 2111190239 metadata/md5-cache/gui-libs/wlroots-9999
-2111221239 metadata/md5-cache/gui-libs/Manifest.gz
 2111221239 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
 2111221239 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
 2111221239 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
+2112070009 metadata/md5-cache/gui-libs/Manifest.gz
+2112070009 metadata/md5-cache/gui-libs/libwpe-1.10.1-r1
+2112070009 metadata/md5-cache/gui-libs/wpebackend-fdo-1.10.0
 2111101109 metadata/md5-cache/gui-wm/Manifest.gz
 2109040224 metadata/md5-cache/gui-wm/hikari-2.2.2-r1
 2109192339 metadata/md5-cache/gui-wm/hikari-2.3.2
@@ -48166,7 +48169,6 @@
 2111292010 metadata/md5-cache/kde-apps/kiten-21.08.3
 2111292010 metadata/md5-cache/kde-apps/kiten-21.11.90
 2111292010 metadata/md5-cache/kde-apps/kitinerary-21.08.3
-2111292010 metadata/md5-cache/kde-apps/kitinerary-21.08.3-r1
 2111292010 metadata/md5-cache/kde-apps/kjumpingcube-21.08.3
 2111292010 metadata/md5-cache/kde-apps/kjumpingcube-21.11.90
 2111292010 metadata/md5-cache/kde-apps/kldap-21.08.3
@@ -48370,7 +48372,6 @@
 2111292010 metadata/md5-cache/kde-apps/zeroconf-ioslave-21.11.90
 2111301639 metadata/md5-cache/kde-apps/kdenlive-21.08.3
 2111301639 metadata/md5-cache/kde-apps/kdenlive-21.11.90
-2112011009 metadata/md5-cache/kde-apps/Manifest.gz
 2112011009 metadata/md5-cache/kde-apps/akonadi-calendar-21.08.3
 2112011009 metadata/md5-cache/kde-apps/akonadi-contacts-21.08.3
 2112011009 metadata/md5-cache/kde-apps/akonadi-mime-21.08.3
@@ -48379,6 +48380,8 @@
 2112011009 metadata/md5-cache/kde-apps/kmailtransport-21.08.3-r2
 2112011009 metadata/md5-cache/kde-apps/kmime-21.08.3
 2112011009 metadata/md5-cache/kde-apps/libkgapi-21.08.3
+2112070009 metadata/md5-cache/kde-apps/Manifest.gz
+2112070009 metadata/md5-cache/kde-apps/kitinerary-21.08.3-r1
 2107261109 metadata/md5-cache/kde-frameworks/kf-env-5
 2111292010 metadata/md5-cache/kde-frameworks/Manifest.gz
 2111292010 metadata/md5-cache/kde-frameworks/attica-5.85.0
@@ -48774,7 +48777,6 @@
 2104261339 metadata/md5-cache/mail-filter/amavisd-milter-1.7.0-r1
 2104181809 metadata/md5-cache/mail-filter/amavisd-milter-1.7.1
 2109200110 metadata/md5-cache/mail-filter/amavisd-new-2.12.0-r5
-2109200110 metadata/md5-cache/mail-filter/amavisd-new-2.12.1
 2109040224 metadata/md5-cache/mail-filter/bmf-0.9.4-r3
 2110012311 metadata/md5-cache/mail-filter/bogofilter-1.2.4-r4
 2111091344 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
@@ -48834,8 +48836,9 @@
 2111241140 metadata/md5-cache/mail-filter/spampd-2.61
 2112012309 metadata/md5-cache/mail-filter/rspamd-3.1
 2112012309 metadata/md5-cache/mail-filter/rspamd-9999
-2112052209 metadata/md5-cache/mail-filter/Manifest.gz
-2112052209 metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
+2112070940 metadata/md5-cache/mail-filter/Manifest.gz
+2112061439 metadata/md5-cache/mail-filter/amavisd-new-2.12.1
+2112070940 metadata/md5-cache/mail-filter/bogofilter-1.2.5-r1
 2109040224 metadata/md5-cache/mail-mta/courier-1.0.13-r1
 2109040224 metadata/md5-cache/mail-mta/courier-1.0.14-r1
 2109040224 metadata/md5-cache/mail-mta/courier-1.0.17-r1
@@ -49091,7 +49094,6 @@
 2110021039 metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
 2109040224 metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
 2109040224 metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
-2111201339 metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r3
 2111231609 metadata/md5-cache/media-fonts/ipaex-002.01
 2111231609 metadata/md5-cache/media-fonts/ipaex-004.01
 2111231609 metadata/md5-cache/media-fonts/ja-ipafonts-003.03
@@ -49145,11 +49147,12 @@
 2112011839 metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
 2112011109 metadata/md5-cache/media-fonts/wqy-bitmapfont-1.0.0_rc1
 2112050809 metadata/md5-cache/media-fonts/fontawesome-5.15.3
-2112060439 metadata/md5-cache/media-fonts/Manifest.gz
 2112051039 metadata/md5-cache/media-fonts/fira-code-6.1
-2112052139 metadata/md5-cache/media-fonts/kanjistrokeorders-4.004
-2112060439 metadata/md5-cache/media-fonts/sil-padauk-4.000
-2112060009 metadata/md5-cache/media-fonts/stix-fonts-2.11
+2112071110 metadata/md5-cache/media-fonts/Manifest.gz
+2112071110 metadata/md5-cache/media-fonts/jisx0213-fonts-20040425-r3
+2112061840 metadata/md5-cache/media-fonts/kanjistrokeorders-4.004
+2112061840 metadata/md5-cache/media-fonts/sil-padauk-4.000
+2112062309 metadata/md5-cache/media-fonts/stix-fonts-2.11
 2109040224 metadata/md5-cache/media-gfx/aaphoto-0.45
 2110012311 metadata/md5-cache/media-gfx/aewan-1.0.01-r1
 2111091344 metadata/md5-cache/media-gfx/ahoviewer-2.0.0_beta
@@ -49279,7 +49282,6 @@
 2111091344 metadata/md5-cache/media-gfx/inkscape-9999
 2110012311 metadata/md5-cache/media-gfx/iscan-2.30.4.2-r1
 2110312244 metadata/md5-cache/media-gfx/iscan-3.63.0
-2110312244 metadata/md5-cache/media-gfx/iscan-3.65.0
 2109200110 metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
 2109031840 metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
 2109031840 metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
@@ -49352,7 +49354,6 @@
 2110012311 metadata/md5-cache/media-gfx/pngtools-0.4-r2
 2109040224 metadata/md5-cache/media-gfx/potrace-1.15
 2109040224 metadata/md5-cache/media-gfx/potrace-1.16
-2110012311 metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
 2110312244 metadata/md5-cache/media-gfx/pqiv-2.11
 2110312244 metadata/md5-cache/media-gfx/pqiv-9999
 1805290208 metadata/md5-cache/media-gfx/pqstego-0.0.1
@@ -49423,7 +49424,6 @@
 2109040224 metadata/md5-cache/media-gfx/zgv-5.9
 2111190039 metadata/md5-cache/media-gfx/frogr-1.5
 2111190710 metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
-2111201339 metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
 2111211039 metadata/md5-cache/media-gfx/alembic-1.8.3-r1
 2111221309 metadata/md5-cache/media-gfx/fontforge-20201107
 2111221339 metadata/md5-cache/media-gfx/gscan2pdf-2.12.4
@@ -49474,8 +49474,11 @@
 2112050109 metadata/md5-cache/media-gfx/openvdb-8.2.0-r1
 2112031909 metadata/md5-cache/media-gfx/plantuml-1.2021.13
 2112031309 metadata/md5-cache/media-gfx/plantuml-1.2021.15
-2112052209 metadata/md5-cache/media-gfx/Manifest.gz
-2112052209 metadata/md5-cache/media-gfx/gifsicle-1.93
+2112070940 metadata/md5-cache/media-gfx/Manifest.gz
+2112070940 metadata/md5-cache/media-gfx/gifsicle-1.93
+2112061109 metadata/md5-cache/media-gfx/iscan-3.65.0
+2112070540 metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
+2112061539 metadata/md5-cache/media-gfx/povray-3.7.0.0-r1
 2110312244 metadata/md5-cache/media-libs/Field3D-1.7.2
 2110312244 metadata/md5-cache/media-libs/SoQt-1.6.0
 2110312244 metadata/md5-cache/media-libs/SoXt-1.4.0
@@ -49609,8 +49612,6 @@
 2110012311 metadata/md5-cache/media-libs/guilib-1.2.1-r1
 2111112139 metadata/md5-cache/media-libs/gupnp-dlna-0.10.5
 2111112139 metadata/md5-cache/media-libs/gupnp-dlna-0.11.0
-2111091344 metadata/md5-cache/media-libs/hamlib-4.2
-2111091344 metadata/md5-cache/media-libs/harfbuzz-2.9.1
 2111091344 metadata/md5-cache/media-libs/harfbuzz-9999
 1911150539 metadata/md5-cache/media-libs/icc-profiles-basiccolor-printing2009-1.2.0
 2110312244 metadata/md5-cache/media-libs/icc-profiles-openicc-1.3.1
@@ -49862,7 +49863,6 @@
 2111091344 metadata/md5-cache/media-libs/lilv-0.24.12
 2101060939 metadata/md5-cache/media-libs/lsp-plugins-1.1.22
 2110312244 metadata/md5-cache/media-libs/lsp-plugins-1.1.24
-2110312244 metadata/md5-cache/media-libs/lsp-plugins-1.1.29
 2110312244 metadata/md5-cache/media-libs/lsp-plugins-9999
 2111091344 metadata/md5-cache/media-libs/lv2-1.18.2
 2111091344 metadata/md5-cache/media-libs/lvtk-1.2.0-r1
@@ -49921,7 +49921,6 @@
 2110312244 metadata/md5-cache/media-libs/qtav-1.12.0-r3
 2110312244 metadata/md5-cache/media-libs/quarter-1.1.0
 2110170109 metadata/md5-cache/media-libs/quesoglc-0.7.2-r1
-2110012311 metadata/md5-cache/media-libs/quvi-0.9.5
 2110012311 metadata/md5-cache/media-libs/raptor-2.0.15-r4
 2110312244 metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20160424
 2110312244 metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
@@ -49929,7 +49928,6 @@
 2104021709 metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20201201
 2110012311 metadata/md5-cache/media-libs/resid-0.16_p2-r1
 2111091344 metadata/md5-cache/media-libs/rlottie-0.2_p20210405
-2111121239 metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
 2110012311 metadata/md5-cache/media-libs/rtaudio-5.1.0
 2111171239 metadata/md5-cache/media-libs/rtaudio-5.2.0
 2111091344 metadata/md5-cache/media-libs/rubberband-1.9.2
@@ -50033,7 +50031,6 @@
 2111260739 metadata/md5-cache/media-libs/openexr-3.1.2
 2111260739 metadata/md5-cache/media-libs/openexr-3.1.3
 2111251810 metadata/md5-cache/media-libs/pnglite-0.1.17-r1
-2111250310 metadata/md5-cache/media-libs/rubberband-2.0.0
 2111251710 metadata/md5-cache/media-libs/spandsp-0.0.6-r1
 2111251810 metadata/md5-cache/media-libs/zvbi-0.2.35-r2
 2111262210 metadata/md5-cache/media-libs/harfbuzz-3.1.2
@@ -50086,10 +50083,15 @@
 2112030409 metadata/md5-cache/media-libs/opencv-4.5.2-r5
 2112042239 metadata/md5-cache/media-libs/opencv-4.5.4
 2112040439 metadata/md5-cache/media-libs/openimageio-2.3.10.0
-2112060110 metadata/md5-cache/media-libs/Manifest.gz
 2112060110 metadata/md5-cache/media-libs/gmmlib-21.3.3
-2112060110 metadata/md5-cache/media-libs/lib3mf-2.2.0
 2112060110 metadata/md5-cache/media-libs/mesa-9999
+2112071310 metadata/md5-cache/media-libs/Manifest.gz
+2112071009 metadata/md5-cache/media-libs/alsa-lib-1.2.6
+2112071009 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6
+2112061439 metadata/md5-cache/media-libs/lib3mf-2.2.0
+2112061809 metadata/md5-cache/media-libs/lsp-plugins-1.1.29
+2112070339 metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
+2112070410 metadata/md5-cache/media-libs/rubberband-2.0.0
 2110012311 metadata/md5-cache/media-plugins/alsa-plugins-1.2.2
 2110012311 metadata/md5-cache/media-plugins/alsa-plugins-1.2.5
 2109040224 metadata/md5-cache/media-plugins/alsaequal-0.7.1
@@ -50550,7 +50552,6 @@
 2109040224 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
 2109040224 metadata/md5-cache/media-plugins/vdr-osdteletext-1.1.1
 2109040224 metadata/md5-cache/media-plugins/vdr-osdteletext-2.1.1
-2109040224 metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
 2109040224 metadata/md5-cache/media-plugins/vdr-peer-0.0.1
 2109040224 metadata/md5-cache/media-plugins/vdr-permashift-1.0.1-r1
 2109040224 metadata/md5-cache/media-plugins/vdr-permashift-1.0.4_pre20200301
@@ -50618,7 +50619,9 @@
 2111230039 metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.4-r2
 2111240139 metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r1
 2111240410 metadata/md5-cache/media-plugins/gst-plugins-opencv-1.18.4-r2
-2112020039 metadata/md5-cache/media-plugins/Manifest.gz
+2112071110 metadata/md5-cache/media-plugins/Manifest.gz
+2112071009 metadata/md5-cache/media-plugins/alsa-plugins-1.2.6
+2112071110 metadata/md5-cache/media-plugins/vdr-osdteletext-2.2.1
 2105202109 metadata/md5-cache/media-radio/adifmerg-31-r1
 2110012311 metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
@@ -50755,7 +50758,6 @@
 2109040224 metadata/md5-cache/media-sound/dvda-author-10.06-r1
 2111091344 metadata/md5-cache/media-sound/easyeffects-5.0.4-r1
 2111121239 metadata/md5-cache/media-sound/easyeffects-6.1.4
-2111182039 metadata/md5-cache/media-sound/easyeffects-6.1.5
 2110312244 metadata/md5-cache/media-sound/easytag-2.4.3-r2
 2111091344 metadata/md5-cache/media-sound/ecasound-2.9.3
 2109040224 metadata/md5-cache/media-sound/erec-2.2.0.1-r1
@@ -50808,8 +50810,6 @@
 2109040224 metadata/md5-cache/media-sound/herrie-2.2-r2
 2109040224 metadata/md5-cache/media-sound/horgand-1.14-r2
 2110312244 metadata/md5-cache/media-sound/hydrogen-1.0.2
-2110312244 metadata/md5-cache/media-sound/hydrogen-1.1.0
-2110312244 metadata/md5-cache/media-sound/hydrogen-9999
 1910161509 metadata/md5-cache/media-sound/icecream-1.3
 2109270139 metadata/md5-cache/media-sound/id3-0.15-r1
 2109040224 metadata/md5-cache/media-sound/id3ed-1.10.4-r1
@@ -50923,7 +50923,6 @@
 2111121109 metadata/md5-cache/media-sound/pasystray-0.8.0
 2111091344 metadata/md5-cache/media-sound/patchage-1.0.4
 2109040224 metadata/md5-cache/media-sound/pavucontrol-4.0
-2111011310 metadata/md5-cache/media-sound/pavucontrol-5.0-r1
 2110312244 metadata/md5-cache/media-sound/pavucontrol-qt-0.17.0
 2011141839 metadata/md5-cache/media-sound/pavumeter-0.9.3-r1
 2109040224 metadata/md5-cache/media-sound/peercast-0.1218-r2
@@ -50967,8 +50966,6 @@
 2110012311 metadata/md5-cache/media-sound/qmidiroute-0.4.0
 2110312244 metadata/md5-cache/media-sound/qmmp-1.5.1
 2110312244 metadata/md5-cache/media-sound/qmmp-9999
-2110312244 metadata/md5-cache/media-sound/qsampler-0.9.4
-2110312244 metadata/md5-cache/media-sound/qsampler-9999
 2110312244 metadata/md5-cache/media-sound/qsynth-0.9.4
 2110312244 metadata/md5-cache/media-sound/qsynth-9999
 2110312244 metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
@@ -51103,8 +51100,17 @@
 2112020809 metadata/md5-cache/media-sound/ttaenc-3.4.1-r1
 2112050809 metadata/md5-cache/media-sound/lollypop-1.4.18
 2112031309 metadata/md5-cache/media-sound/mpc-0.34
-2112051109 metadata/md5-cache/media-sound/Manifest.gz
 2112051109 metadata/md5-cache/media-sound/yoshimi-2.1.2.2
+2112071009 metadata/md5-cache/media-sound/Manifest.gz
+2112061309 metadata/md5-cache/media-sound/abcmidi-2021.12.05
+2112071009 metadata/md5-cache/media-sound/alsa-utils-1.2.6
+2112070339 metadata/md5-cache/media-sound/easyeffects-6.1.5
+2112061439 metadata/md5-cache/media-sound/hydrogen-1.1.0
+2112061439 metadata/md5-cache/media-sound/hydrogen-1.1.1
+2112061439 metadata/md5-cache/media-sound/hydrogen-9999
+2112070009 metadata/md5-cache/media-sound/pavucontrol-5.0-r1
+2112061309 metadata/md5-cache/media-sound/qsampler-0.9.4
+2112061309 metadata/md5-cache/media-sound/qsampler-9999
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -51173,11 +51179,8 @@
 2109040224 metadata/md5-cache/media-video/chaplin-1.10-r2
 2111112139 metadata/md5-cache/media-video/cheese-3.38.0
 2111112139 metadata/md5-cache/media-video/cheese-3.38.0-r1
-2109040224 metadata/md5-cache/media-video/clive-2.3.0.1
 2109040224 metadata/md5-cache/media-video/cpvts-1.2-r1
 2111091344 metadata/md5-cache/media-video/devedeng-4.16.0-r1
-2110312244 metadata/md5-cache/media-video/droidcam-1.8.0
-2110312244 metadata/md5-cache/media-video/droidcam-1.8.0-r1
 2004261409 metadata/md5-cache/media-video/dv2sub-0.3-r1
 2109040224 metadata/md5-cache/media-video/dvbackup-0.0.4-r2
 2110221139 metadata/md5-cache/media-video/dvbsnoop-1.4.50-r2
@@ -51380,9 +51383,10 @@
 2112022010 metadata/md5-cache/media-video/jubler-5.1
 2112022010 metadata/md5-cache/media-video/projectx-0.91.0.10-r3
 2112012309 metadata/md5-cache/media-video/wireplumber-0.4.5-r1
-2112041709 metadata/md5-cache/media-video/Manifest.gz
 2112041709 metadata/md5-cache/media-video/jellyfin-media-player-1.6.1
 2112041039 metadata/md5-cache/media-video/yle-dl-20211203
+2112071310 metadata/md5-cache/media-video/Manifest.gz
+2112071310 metadata/md5-cache/media-video/droidcam-1.8.1
 2111091344 metadata/md5-cache/net-analyzer/2ping-4.5.1
 2110012311 metadata/md5-cache/net-analyzer/alive-2.0.2-r1
 2110012311 metadata/md5-cache/net-analyzer/alive-2.0.3
@@ -51739,8 +51743,6 @@
 2111091344 metadata/md5-cache/net-analyzer/wapiti-3.0.5
 2111091344 metadata/md5-cache/net-analyzer/wapiti-9999
 2109040224 metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r2
-2111091344 metadata/md5-cache/net-analyzer/wireshark-3.4.7-r1
-2111091344 metadata/md5-cache/net-analyzer/wireshark-3.4.8
 2111181209 metadata/md5-cache/net-analyzer/wireshark-3.4.9
 2109040224 metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
 2109040224 metadata/md5-cache/net-analyzer/xprobe-0.3-r1
@@ -51758,8 +51760,6 @@
 2111191810 metadata/md5-cache/net-analyzer/suricata-6.0.4
 2111210809 metadata/md5-cache/net-analyzer/arping-2.22
 2111252109 metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4-r1
-2111240610 metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1
-2111240610 metadata/md5-cache/net-analyzer/wireshark-9999
 2111292209 metadata/md5-cache/net-analyzer/arp-sk-0.0.16-r2
 2111290609 metadata/md5-cache/net-analyzer/icinga2-2.13.2-r1
 2111292209 metadata/md5-cache/net-analyzer/ipcad-3.7.3
@@ -51779,9 +51779,12 @@
 2112022010 metadata/md5-cache/net-analyzer/zabbix-5.4.6
 2112022010 metadata/md5-cache/net-analyzer/zabbix-5.4.7-r1
 2112022010 metadata/md5-cache/net-analyzer/zabbix-5.4.8
-2112041339 metadata/md5-cache/net-analyzer/Manifest.gz
 2112031909 metadata/md5-cache/net-analyzer/sslscan-2.0.10
 2112040439 metadata/md5-cache/net-analyzer/wireshark-3.4.10
+2112071040 metadata/md5-cache/net-analyzer/Manifest.gz
+2112071009 metadata/md5-cache/net-analyzer/dsniff-2.4_beta1_p30
+2112071040 metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1
+2112070540 metadata/md5-cache/net-analyzer/wireshark-9999
 2110312244 metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20210430
 2110312244 metadata/md5-cache/net-dialup/accel-ppp-9999
 2110312244 metadata/md5-cache/net-dialup/cutecom-0.51.0-r1
@@ -51821,9 +51824,9 @@
 2111252140 metadata/md5-cache/net-dialup/pppconfig-2.3.25
 2111292209 metadata/md5-cache/net-dialup/pppconfig-2.3.21
 2112020039 metadata/md5-cache/net-dialup/rp-pppoe-3.15-r1
-2112060439 metadata/md5-cache/net-dialup/Manifest.gz
-2112060439 metadata/md5-cache/net-dialup/ppp-2.4.9-r5
-2112060439 metadata/md5-cache/net-dialup/rp-pppoe-3.15
+2112061840 metadata/md5-cache/net-dialup/Manifest.gz
+2112061840 metadata/md5-cache/net-dialup/ppp-2.4.9-r5
+2112061840 metadata/md5-cache/net-dialup/rp-pppoe-3.15
 2111091344 metadata/md5-cache/net-dns/avahi-0.8-r5
 2111091344 metadata/md5-cache/net-dns/bind-9.16.15-r2
 2111091344 metadata/md5-cache/net-dns/bind-9.16.18
@@ -51907,14 +51910,14 @@
 2111211609 metadata/md5-cache/net-dns/pdns-4.5.1
 2111211609 metadata/md5-cache/net-dns/pdns-4.5.2
 2111231309 metadata/md5-cache/net-dns/knot-3.1.4
-2111280510 metadata/md5-cache/net-dns/opendnssec-2.1.10
 2112020609 metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r4
 2112022010 metadata/md5-cache/net-dns/libidn-1.38-r1
-2112050139 metadata/md5-cache/net-dns/Manifest.gz
 2112032239 metadata/md5-cache/net-dns/ddclient-3.9.1-r1
 2112041209 metadata/md5-cache/net-dns/ldns-utils-1.8.0-r1
 2112050139 metadata/md5-cache/net-dns/ldns-utils-1.8.0-r2
 2112041939 metadata/md5-cache/net-dns/unbound-1.13.2-r1
+2112071310 metadata/md5-cache/net-dns/Manifest.gz
+2112071310 metadata/md5-cache/net-dns/opendnssec-2.1.10-r1
 2109200110 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
 2110182240 metadata/md5-cache/net-firewall/conntrack-tools-1.4.5
 2110182240 metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
@@ -51954,8 +51957,8 @@
 2111192139 metadata/md5-cache/net-firewall/nftables-9999
 2112032239 metadata/md5-cache/net-firewall/arptables-0.0.5-r2
 2112030339 metadata/md5-cache/net-firewall/nfacct-1.0.2-r1
-2112052209 metadata/md5-cache/net-firewall/Manifest.gz
-2112052209 metadata/md5-cache/net-firewall/ipset-7.15
+2112070940 metadata/md5-cache/net-firewall/Manifest.gz
+2112070940 metadata/md5-cache/net-firewall/ipset-7.15
 2110182240 metadata/md5-cache/net-fs/autofs-5.1.6-r2
 2110182240 metadata/md5-cache/net-fs/autofs-5.1.7-r1
 2111091344 metadata/md5-cache/net-fs/btfs-2.22
@@ -52112,7 +52115,6 @@
 2111221639 metadata/md5-cache/net-im/pidgin-2.14.7
 2111221639 metadata/md5-cache/net-im/pidgin-2.14.8
 2111252340 metadata/md5-cache/net-im/qtox-1.17.3
-2111250140 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.6.0
 2111292010 metadata/md5-cache/net-im/choqok-1.7.0
 2111291039 metadata/md5-cache/net-im/mattermost-desktop-bin-5.0.2
 2111292010 metadata/md5-cache/net-im/neochat-1.2.0
@@ -52121,10 +52123,12 @@
 2112022010 metadata/md5-cache/net-im/kouchat-1.1.0
 2112012139 metadata/md5-cache/net-im/skypeforlinux-8.78.0.161-r2
 2112012239 metadata/md5-cache/net-im/zoom-5.8.6.739
-2112040309 metadata/md5-cache/net-im/Manifest.gz
 2112031709 metadata/md5-cache/net-im/gajim-1.3.3-r1
 2112040309 metadata/md5-cache/net-im/signal-desktop-bin-5.25.0-r1
 2112040309 metadata/md5-cache/net-im/skypeforlinux-8.79.0.92
+2112071409 metadata/md5-cache/net-im/Manifest.gz
+2112071409 metadata/md5-cache/net-im/ejabberd-21.04-r1
+2112071310 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.0
 2110312244 metadata/md5-cache/net-irc/anope-2.0.10
 2110312244 metadata/md5-cache/net-irc/anope-2.0.9
 2109040224 metadata/md5-cache/net-irc/atheme-services-7.2.11-r1
@@ -52220,7 +52224,6 @@
 2110312244 metadata/md5-cache/net-libs/cppzmq-4.6.0
 2109040224 metadata/md5-cache/net-libs/cvm-0.97-r1
 2105160309 metadata/md5-cache/net-libs/czmq-4.2.0
-2110151339 metadata/md5-cache/net-libs/czmq-4.2.1
 2110012311 metadata/md5-cache/net-libs/daq-2.0.7
 2110312244 metadata/md5-cache/net-libs/davix-0.7.6
 2111091344 metadata/md5-cache/net-libs/dleyna-connector-dbus-0.4.0
@@ -52508,7 +52511,6 @@
 2110312244 metadata/md5-cache/net-libs/usrsctp-0.9.3.0_p20201102
 2110312244 metadata/md5-cache/net-libs/usrsctp-0.9.5.0
 2110012311 metadata/md5-cache/net-libs/wandio-4.2.3_p1-r1
-2111091344 metadata/md5-cache/net-libs/webkit-gtk-2.32.4
 2111091344 metadata/md5-cache/net-libs/webkit-gtk-2.34.1-r1
 2110012311 metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r2
 2110012311 metadata/md5-cache/net-libs/wvstreams-99999
@@ -52551,15 +52553,16 @@
 2112030439 metadata/md5-cache/net-libs/libbloom-1.6
 2112030439 metadata/md5-cache/net-libs/libcork-0.15.0-r2
 2112030439 metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8
-2112052239 metadata/md5-cache/net-libs/Manifest.gz
-2112052209 metadata/md5-cache/net-libs/canlock-3.2.2
 2112051939 metadata/md5-cache/net-libs/ldns-1.8.0-r1
-2112052239 metadata/md5-cache/net-libs/liblockfile-1.17
+2112070940 metadata/md5-cache/net-libs/Manifest.gz
+2112070940 metadata/md5-cache/net-libs/canlock-3.2.2
+2112070940 metadata/md5-cache/net-libs/czmq-4.2.1
+2112070940 metadata/md5-cache/net-libs/liblockfile-1.17
+2112070009 metadata/md5-cache/net-libs/webkit-gtk-2.32.4
 2109040224 metadata/md5-cache/net-mail/altermime-0.3.11
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 2108061839 metadata/md5-cache/net-mail/amavis-logwatch-1.51.04
 2111091344 metadata/md5-cache/net-mail/automx2-2021.4
-2111091344 metadata/md5-cache/net-mail/automx2-2021.5
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2109040224 metadata/md5-cache/net-mail/checkpassword-0.90-r5
@@ -52596,7 +52599,6 @@
 2111091344 metadata/md5-cache/net-mail/hyperkitty-1.3.3
 2111060309 metadata/md5-cache/net-mail/imapsync-1.977
 2106081009 metadata/md5-cache/net-mail/isync-1.3.6
-2106071909 metadata/md5-cache/net-mail/isync-1.4.2
 2110012311 metadata/md5-cache/net-mail/isync-9999
 2012201939 metadata/md5-cache/net-mail/lbdb-0.47
 2109040224 metadata/md5-cache/net-mail/libdbx-1.0.3
@@ -52684,9 +52686,11 @@
 2111251540 metadata/md5-cache/net-mail/mailshears-0.0.4-r1
 2111240840 metadata/md5-cache/net-mail/notmuch-0.34.1
 2111261710 metadata/md5-cache/net-mail/dovecot-2.3.17
-2112020739 metadata/md5-cache/net-mail/Manifest.gz
 2112020739 metadata/md5-cache/net-mail/b4-0.8.0
 2112011009 metadata/md5-cache/net-mail/mu-1.6.9
+2112070940 metadata/md5-cache/net-mail/Manifest.gz
+2112061039 metadata/md5-cache/net-mail/automx2-2021.5
+2112070940 metadata/md5-cache/net-mail/isync-1.4.4
 2110252309 metadata/md5-cache/net-misc/AQtion-2.2.7-r1
 2110252309 metadata/md5-cache/net-misc/AQtion-2.3.1-r1
 2110252309 metadata/md5-cache/net-misc/AQtion-2.3.4-r1
@@ -52964,7 +52968,6 @@
 2007201209 metadata/md5-cache/net-misc/netsed-1.3
 2110012311 metadata/md5-cache/net-misc/netstat-nat-1.4.10
 2111112139 metadata/md5-cache/net-misc/networkmanager-1.32.10-r1
-2111112139 metadata/md5-cache/net-misc/networkmanager-1.32.12-r1
 2111112139 metadata/md5-cache/net-misc/networkmanager-1.32.4-r1
 2111112139 metadata/md5-cache/net-misc/networkmanager-1.32.8-r1
 2110312244 metadata/md5-cache/net-misc/nextcloud-client-3.1.3
@@ -53233,19 +53236,21 @@
 2112022010 metadata/md5-cache/net-misc/tigervnc-1.11.0-r4
 2112022010 metadata/md5-cache/net-misc/tigervnc-1.9.0-r2
 2112022010 metadata/md5-cache/net-misc/turbovnc-2.2.6
-2112010409 metadata/md5-cache/net-misc/yt-dlp-2021.12.1
 2112030539 metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612
 2112031009 metadata/md5-cache/net-misc/openssh-8.7_p1-r3
 2112031009 metadata/md5-cache/net-misc/openssh-8.8_p1-r2
 2112031009 metadata/md5-cache/net-misc/openssh-8.8_p1-r3
 2112031639 metadata/md5-cache/net-misc/xmrig-6.16.2
-2112060510 metadata/md5-cache/net-misc/Manifest.gz
 2112060439 metadata/md5-cache/net-misc/bridge-utils-1.7.1
 2112052239 metadata/md5-cache/net-misc/cmst-2021.12.02
-2112052139 metadata/md5-cache/net-misc/networkmanager-1.32.12
 2112060510 metadata/md5-cache/net-misc/ntpsec-1.2.1-r1
 2112060510 metadata/md5-cache/net-misc/ntpsec-9999
-2112052339 metadata/md5-cache/net-misc/socat-1.7.4.2
+2112070940 metadata/md5-cache/net-misc/Manifest.gz
+2112070940 metadata/md5-cache/net-misc/networkmanager-1.32.12
+2112070339 metadata/md5-cache/net-misc/networkmanager-1.32.12-r1
+2112061840 metadata/md5-cache/net-misc/socat-1.7.4.2
+2112070310 metadata/md5-cache/net-misc/tigervnc-9999
+2112070039 metadata/md5-cache/net-misc/yt-dlp-2021.12.1-r1
 2111091344 metadata/md5-cache/net-nds/389-ds-base-1.4.4.17
 2110012311 metadata/md5-cache/net-nds/adtool-1.3.3-r1
 2105111309 metadata/md5-cache/net-nds/gssproxy-0.8.4
@@ -53366,7 +53371,6 @@
 2110312244 metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
 2110312244 metadata/md5-cache/net-p2p/retroshare-0.6.5-r3
 2110312244 metadata/md5-cache/net-p2p/retroshare-0.6.6
-2110312244 metadata/md5-cache/net-p2p/retroshare-0.6.6-r1
 2110182240 metadata/md5-cache/net-p2p/rtorrent-0.9.7
 2110182240 metadata/md5-cache/net-p2p/rtorrent-0.9.7-r1
 2110182240 metadata/md5-cache/net-p2p/rtorrent-0.9.8
@@ -53386,10 +53390,11 @@
 2111261840 metadata/md5-cache/net-p2p/gtorrentviewer-0.2b-r1
 2111292010 metadata/md5-cache/net-p2p/ktorrent-21.08.3
 2111292010 metadata/md5-cache/net-p2p/ktorrent-21.11.90
-2112022010 metadata/md5-cache/net-p2p/Manifest.gz
 2112022010 metadata/md5-cache/net-p2p/freenet-0.7.5_p1488-r1
 2112022010 metadata/md5-cache/net-p2p/freenet-0.7.5_p1491
 2112022010 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r1
+2112071110 metadata/md5-cache/net-p2p/Manifest.gz
+2112071110 metadata/md5-cache/net-p2p/retroshare-0.6.6-r1
 2010020309 metadata/md5-cache/net-print/apsfilter-7.2.8-r1
 2110312244 metadata/md5-cache/net-print/brlaser-6
 2011290239 metadata/md5-cache/net-print/c2esp-27
@@ -53455,8 +53460,6 @@
 2110182240 metadata/md5-cache/net-proxy/haproxy-2.0.9999
 2111111809 metadata/md5-cache/net-proxy/haproxy-2.2.18
 2110182240 metadata/md5-cache/net-proxy/haproxy-2.2.9999
-2110182240 metadata/md5-cache/net-proxy/haproxy-2.4.7
-2111111809 metadata/md5-cache/net-proxy/haproxy-2.4.8
 2110182240 metadata/md5-cache/net-proxy/haproxy-2.4.9999
 2109240040 metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.2.0
 2109240040 metadata/md5-cache/net-proxy/haproxy-dataplaneapi-2.3.0
@@ -53495,10 +53498,11 @@
 2111241440 metadata/md5-cache/net-proxy/haproxy-2.5.0
 2111241440 metadata/md5-cache/net-proxy/haproxy-2.5.9999
 2111251340 metadata/md5-cache/net-proxy/hatop-0.8.1
-2112041309 metadata/md5-cache/net-proxy/Manifest.gz
 2112041309 metadata/md5-cache/net-proxy/mitmproxy-7.0.4
 2112030439 metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
 2112030439 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
+2112071110 metadata/md5-cache/net-proxy/Manifest.gz
+2112071110 metadata/md5-cache/net-proxy/haproxy-2.0.26
 2111091344 metadata/md5-cache/net-voip/Manifest.gz
 2110012311 metadata/md5-cache/net-voip/captagent-6.3.1
 2111091344 metadata/md5-cache/net-voip/sipvicious-0.3.0
@@ -53766,12 +53770,8 @@
 2109022141 metadata/md5-cache/perl-core/Module-CoreList-5.201.806.260
 2109022141 metadata/md5-cache/perl-core/Module-Load-0.360.0
 2111042109 metadata/md5-cache/perl-core/Module-Loaded-0.80.0-r2
-2109040224 metadata/md5-cache/perl-core/Module-Metadata-1.0.26
 2109040224 metadata/md5-cache/perl-core/Params-Check-0.380.0-r1
-2109040224 metadata/md5-cache/perl-core/Pod-Simple-3.280.0
 2109022141 metadata/md5-cache/perl-core/Scalar-List-Utils-1.560.0
-2109040224 metadata/md5-cache/perl-core/Sys-Syslog-0.330.0-r1
-2109040224 metadata/md5-cache/perl-core/Term-ANSIColor-4.20.0
 2109040224 metadata/md5-cache/perl-core/Test-1.260.0
 2109022141 metadata/md5-cache/perl-core/Test-Simple-1.302.183
 2109040224 metadata/md5-cache/perl-core/Text-Balanced-2.20.0-r1
@@ -53781,11 +53781,9 @@
 2109040224 metadata/md5-cache/perl-core/Time-HiRes-1.972.600-r1
 2109022141 metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
 2109022141 metadata/md5-cache/perl-core/Unicode-Collate-1.290.0
-2109040224 metadata/md5-cache/perl-core/parent-0.228-r1
-2109040224 metadata/md5-cache/perl-core/podlators-2.5.3
 2109040224 metadata/md5-cache/perl-core/version-0.990.800
 2111240309 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
-2111240309 metadata/md5-cache/perl-core/Manifest.gz
+2112061039 metadata/md5-cache/perl-core/Manifest.gz
 2111091344 metadata/md5-cache/ros-meta/Manifest.gz
 2111091344 metadata/md5-cache/ros-meta/ament_cmake-0.9.6
 2111091344 metadata/md5-cache/ros-meta/ament_cmake-1.0.0
@@ -54342,7 +54340,6 @@
 2111112139 metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
 2110312244 metadata/md5-cache/sci-geosciences/gpxlab-0.7.0
 2111091344 metadata/md5-cache/sci-geosciences/grass-7.8.5
-2111091344 metadata/md5-cache/sci-geosciences/grass-7.8.6
 2111091344 metadata/md5-cache/sci-geosciences/grass-9999
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
 2109040224 metadata/md5-cache/sci-geosciences/gshhs-1.13
@@ -54396,7 +54393,6 @@
 2111091344 metadata/md5-cache/sci-geosciences/qgis-3.18.3
 2111091344 metadata/md5-cache/sci-geosciences/qgis-3.20.3-r1
 2110312244 metadata/md5-cache/sci-geosciences/qmapshack-1.15.2-r2
-2110312244 metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
 2103020309 metadata/md5-cache/sci-geosciences/readosm-1.0.0e-r1
 2103020309 metadata/md5-cache/sci-geosciences/readosm-1.1.0a
 2111091344 metadata/md5-cache/sci-geosciences/routino-3.3.3
@@ -54430,9 +54426,11 @@
 2112022010 metadata/md5-cache/sci-geosciences/josm-bin-18303
 2112020939 metadata/md5-cache/sci-geosciences/viking-1.10
 2112050740 metadata/md5-cache/sci-geosciences/qmapshack-1.16.1
-2112060739 metadata/md5-cache/sci-geosciences/Manifest.gz
 2112052139 metadata/md5-cache/sci-geosciences/gpxsee-9.10
 2112052139 metadata/md5-cache/sci-geosciences/qgis-3.22.0-r4
+2112071040 metadata/md5-cache/sci-geosciences/Manifest.gz
+2112071040 metadata/md5-cache/sci-geosciences/grass-7.8.6
+2112070940 metadata/md5-cache/sci-geosciences/qmapshack-1.16.0
 2110312244 metadata/md5-cache/sci-libs/ViSP-3.3.0-r1
 2111150310 metadata/md5-cache/sci-libs/adolc-2.7.2
 2110012311 metadata/md5-cache/sci-libs/adolc-9999
@@ -54501,8 +54499,6 @@
 2109040224 metadata/md5-cache/sci-libs/cqrlib-1.1.3
 2110120139 metadata/md5-cache/sci-libs/cxsparse-3.2.0
 2110312244 metadata/md5-cache/sci-libs/dcmtk-3.6.5
-2111032240 metadata/md5-cache/sci-libs/dealii-9.3.1-r1
-2111032240 metadata/md5-cache/sci-libs/dealii-9999
 2110071239 metadata/md5-cache/sci-libs/djbfft-0.76-r3
 2111091344 metadata/md5-cache/sci-libs/dlib-19.22
 2110312244 metadata/md5-cache/sci-libs/dmlc-core-0_p20170719
@@ -54735,7 +54731,6 @@
 2111190309 metadata/md5-cache/sci-libs/cifparse-obj-7.105
 2111190309 metadata/md5-cache/sci-libs/udunits-2.2.28
 2111192109 metadata/md5-cache/sci-libs/pastix-6.0.3
-2111210809 metadata/md5-cache/sci-libs/scotch-6.1.0-r1
 2111220639 metadata/md5-cache/sci-libs/cddlib-094m-r1
 2111220639 metadata/md5-cache/sci-libs/symengine-0.7.0
 2111250740 metadata/md5-cache/sci-libs/indilib-1.9.3
@@ -54775,17 +54770,17 @@
 2112040439 metadata/md5-cache/sci-libs/libqalculate-3.21.0
 2112040439 metadata/md5-cache/sci-libs/libqalculate-3.22.0
 2112050709 metadata/md5-cache/sci-libs/lrslib-071b-r1
-2112060439 metadata/md5-cache/sci-libs/Manifest.gz
-2112060140 metadata/md5-cache/sci-libs/fftw-3.3.10
-2112060110 metadata/md5-cache/sci-libs/gdal-3.3.3
-2112060439 metadata/md5-cache/sci-libs/geos-3.10.0
-2112060439 metadata/md5-cache/sci-libs/proj-8.2.0
+2112070940 metadata/md5-cache/sci-libs/Manifest.gz
+2112070009 metadata/md5-cache/sci-libs/dealii-9.3.1-r1
+2112070009 metadata/md5-cache/sci-libs/dealii-9999
+2112070940 metadata/md5-cache/sci-libs/fftw-3.3.10
+2112061840 metadata/md5-cache/sci-libs/gdal-3.3.3
+2112061840 metadata/md5-cache/sci-libs/geos-3.10.0
+2112061840 metadata/md5-cache/sci-libs/proj-8.2.0
+2112070339 metadata/md5-cache/sci-libs/scotch-6.1.0-r1
 2109111011 metadata/md5-cache/sci-mathematics/agda-2.6.1.2
 2109111011 metadata/md5-cache/sci-mathematics/agda-stdlib-2.6.1.2.1.4
 2101170739 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
-2109040224 metadata/md5-cache/sci-mathematics/arb-2.17.0
-2110312244 metadata/md5-cache/sci-mathematics/arb-2.18.1
-2110312244 metadata/md5-cache/sci-mathematics/arb-2.19.0
 2109040224 metadata/md5-cache/sci-mathematics/bertini-1.4
 2109040224 metadata/md5-cache/sci-mathematics/calc-2.12.5.4
 2109040224 metadata/md5-cache/sci-mathematics/calc-2.13.0.1
@@ -54796,7 +54791,6 @@
 2109040224 metadata/md5-cache/sci-mathematics/coq-8.11.2
 2109040224 metadata/md5-cache/sci-mathematics/coq-8.11.2-r1
 2109040224 metadata/md5-cache/sci-mathematics/coq-8.12.0-r1
-2109040224 metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
 2107012139 metadata/md5-cache/sci-mathematics/coq-8.13.0
 2107261439 metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
 2111091344 metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
@@ -54828,8 +54822,6 @@
 2109040224 metadata/md5-cache/sci-mathematics/gmm-5.1
 2109040224 metadata/md5-cache/sci-mathematics/gmm-5.3
 2111082209 metadata/md5-cache/sci-mathematics/gmm-5.4
-2101051939 metadata/md5-cache/sci-mathematics/gp2c-0.0.11.3
-2101060739 metadata/md5-cache/sci-mathematics/gp2c-0.0.12
 2109040224 metadata/md5-cache/sci-mathematics/gsl-shell-2.3.0_beta1-r1
 2109040224 metadata/md5-cache/sci-mathematics/jags-4.2.0
 2109040224 metadata/md5-cache/sci-mathematics/jags-4.3.0
@@ -54916,10 +54908,13 @@
 2112022010 metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
 2112022010 metadata/md5-cache/sci-mathematics/z3-4.8.11b
 2112022010 metadata/md5-cache/sci-mathematics/z3-4.8.13
-2112040609 metadata/md5-cache/sci-mathematics/Manifest.gz
 2112040609 metadata/md5-cache/sci-mathematics/lean-3.35.1-r2
 2112040609 metadata/md5-cache/sci-mathematics/lean-3.9999
 2112031039 metadata/md5-cache/sci-mathematics/slepc-3.16.0
+2112070940 metadata/md5-cache/sci-mathematics/Manifest.gz
+2112061439 metadata/md5-cache/sci-mathematics/arb-2.19.0
+2112070940 metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
+2112061039 metadata/md5-cache/sci-mathematics/gp2c-0.0.12
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2110012311 metadata/md5-cache/sci-misc/apertium-3.2.0
 2110312244 metadata/md5-cache/sci-misc/boinc-7.16.17
@@ -56530,24 +56525,25 @@
 2111282339 metadata/md5-cache/sys-apps/systemd-9999
 2111282339 metadata/md5-cache/sys-apps/usbutils-014-r1
 2112021139 metadata/md5-cache/sys-apps/exa-0.10.1
-2112021909 metadata/md5-cache/sys-apps/fwupd-1.7.2
 2112010909 metadata/md5-cache/sys-apps/hwloc-2.5.0
 2112022010 metadata/md5-cache/sys-apps/smcipmitool-2.25.0.210326
 2112050809 metadata/md5-cache/sys-apps/init-system-helpers-1.60
 2112031939 metadata/md5-cache/sys-apps/memtest86+-5.31b-r2
-2112050809 metadata/md5-cache/sys-apps/miller-5.10.2
 2112031709 metadata/md5-cache/sys-apps/most-5.1.0
 2112050809 metadata/md5-cache/sys-apps/systemd-249.6
 2112031509 metadata/md5-cache/sys-apps/sysvinit-2.99-r1
 2112031509 metadata/md5-cache/sys-apps/sysvinit-3.00-r1
 2112030809 metadata/md5-cache/sys-apps/ucspi-ssl-0.99e-r2
-2112060439 metadata/md5-cache/sys-apps/Manifest.gz
 2112060110 metadata/md5-cache/sys-apps/cpuid-20211129
 2112060439 metadata/md5-cache/sys-apps/debianutils-5.5
-2112060439 metadata/md5-cache/sys-apps/findutils-4.8.0-r1
 2112060439 metadata/md5-cache/sys-apps/help2man-1.48.5
-2112060009 metadata/md5-cache/sys-apps/hwdata-0.353
 2112052239 metadata/md5-cache/sys-apps/yarn-1.22.17
+2112070940 metadata/md5-cache/sys-apps/Manifest.gz
+2112061139 metadata/md5-cache/sys-apps/findutils-4.8.0-r1
+2112061840 metadata/md5-cache/sys-apps/fwupd-1.7.2-r1
+2112061409 metadata/md5-cache/sys-apps/hwdata-0.353
+2112070940 metadata/md5-cache/sys-apps/miller-5.10.2
+2112062140 metadata/md5-cache/sys-apps/zram-generator-1.1.1
 2110312244 metadata/md5-cache/sys-auth/AusweisApp2-1.22.2
 2110312244 metadata/md5-cache/sys-auth/AusweisApp2-9999
 2109031439 metadata/md5-cache/sys-auth/docker_auth-1.3.1
@@ -56617,7 +56613,6 @@
 2111091344 metadata/md5-cache/sys-auth/seatd-0.5.0
 2111091344 metadata/md5-cache/sys-auth/seatd-0.5.0-r1
 2111091344 metadata/md5-cache/sys-auth/seatd-0.6.2-r1
-2111091344 metadata/md5-cache/sys-auth/seatd-0.6.3
 2111091344 metadata/md5-cache/sys-auth/seatd-9999
 2109040224 metadata/md5-cache/sys-auth/skey-1.1.5-r12
 2111091344 metadata/md5-cache/sys-auth/solo-python-0.0.30
@@ -56637,8 +56632,9 @@
 2111301439 metadata/md5-cache/sys-auth/pam_mysql-0.8.2-r1
 2112021139 metadata/md5-cache/sys-auth/fprintd-1.94.0
 2112021139 metadata/md5-cache/sys-auth/libfprint-1.94.1-r1
-2112052139 metadata/md5-cache/sys-auth/Manifest.gz
-2112052139 metadata/md5-cache/sys-auth/polkit-0.120-r1
+2112070540 metadata/md5-cache/sys-auth/Manifest.gz
+2112061840 metadata/md5-cache/sys-auth/polkit-0.120-r1
+2112070540 metadata/md5-cache/sys-auth/seatd-0.6.3
 2109040224 metadata/md5-cache/sys-block/aoetools-37
 2110182240 metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
 2110182240 metadata/md5-cache/sys-block/arcconf-3.07.23971
@@ -56742,8 +56738,8 @@
 2111292010 metadata/md5-cache/sys-block/partitionmanager-21.08.3
 2111292010 metadata/md5-cache/sys-block/partitionmanager-21.11.90
 2112022139 metadata/md5-cache/sys-block/io-scheduler-udev-rules-2
-2112050809 metadata/md5-cache/sys-block/Manifest.gz
-2112050809 metadata/md5-cache/sys-block/ms-sys-2.7.0
+2112070940 metadata/md5-cache/sys-block/Manifest.gz
+2112070940 metadata/md5-cache/sys-block/ms-sys-2.7.0
 2109040224 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
 2109182339 metadata/md5-cache/sys-boot/aboot-2.0_pre20210801
 2109182309 metadata/md5-cache/sys-boot/aboot-9999
@@ -56802,8 +56798,8 @@
 2112050439 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20211118
 2112031739 metadata/md5-cache/sys-boot/woeusb-5.1.2-r1
 2112041109 metadata/md5-cache/sys-boot/woeusb-5.2.4
-2112060110 metadata/md5-cache/sys-boot/Manifest.gz
-2112060110 metadata/md5-cache/sys-boot/refind-0.13.2
+2112070940 metadata/md5-cache/sys-boot/Manifest.gz
+2112070940 metadata/md5-cache/sys-boot/refind-0.13.2
 2111150310 metadata/md5-cache/sys-cluster/ampi-0_pre20140616
 2005081846 metadata/md5-cache/sys-cluster/c3-4.0.1
 2111091344 metadata/md5-cache/sys-cluster/ceph-14.2.22-r1
@@ -57036,8 +57032,6 @@
 2109040224 metadata/md5-cache/sys-devel/binutils-2.35.2
 2109040224 metadata/md5-cache/sys-devel/binutils-2.36.1-r2
 2110060239 metadata/md5-cache/sys-devel/binutils-2.37_p1
-2111150139 metadata/md5-cache/sys-devel/binutils-2.37_p1-r1
-2109160511 metadata/md5-cache/sys-devel/binutils-9999
 2109040224 metadata/md5-cache/sys-devel/binutils-apple-11.3.1-r1
 2109040224 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
 2109040224 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
@@ -57087,8 +57081,6 @@
 2111091344 metadata/md5-cache/sys-devel/lld-11.1.0
 2111091344 metadata/md5-cache/sys-devel/lld-11.1.0-r1
 2111091344 metadata/md5-cache/sys-devel/lld-12.0.1
-2111131139 metadata/md5-cache/sys-devel/lld-13.0.0
-2111091344 metadata/md5-cache/sys-devel/lld-14.0.0.9999
 2111091344 metadata/md5-cache/sys-devel/llvm-11.1.0
 2111091344 metadata/md5-cache/sys-devel/llvm-12.0.1
 2111131139 metadata/md5-cache/sys-devel/llvm-13.0.0
@@ -57167,8 +57159,6 @@
 2111301309 metadata/md5-cache/sys-devel/clang-common-13.0.1_rc1
 2111301309 metadata/md5-cache/sys-devel/clang-runtime-13.0.1.9999
 2111301309 metadata/md5-cache/sys-devel/clang-runtime-13.0.1_rc1
-2111301309 metadata/md5-cache/sys-devel/lld-13.0.1.9999
-2111301309 metadata/md5-cache/sys-devel/lld-13.0.1_rc1
 2111301309 metadata/md5-cache/sys-devel/llvm-13.0.1.9999
 2111301309 metadata/md5-cache/sys-devel/llvm-13.0.1_rc1
 2111301309 metadata/md5-cache/sys-devel/llvm-14.0.0.9999
@@ -57178,8 +57168,14 @@
 2112011639 metadata/md5-cache/sys-devel/gdb-11.1
 2112022010 metadata/md5-cache/sys-devel/gettext-0.21-r1
 2112040239 metadata/md5-cache/sys-devel/clang-13.0.1_rc1
-2112052239 metadata/md5-cache/sys-devel/Manifest.gz
-2112052239 metadata/md5-cache/sys-devel/bison-3.8.2
+2112070210 metadata/md5-cache/sys-devel/Manifest.gz
+2112070210 metadata/md5-cache/sys-devel/binutils-2.37_p1-r1
+2112070210 metadata/md5-cache/sys-devel/binutils-9999
+2112061840 metadata/md5-cache/sys-devel/bison-3.8.2
+2112070210 metadata/md5-cache/sys-devel/lld-13.0.0
+2112070210 metadata/md5-cache/sys-devel/lld-13.0.1.9999
+2112070210 metadata/md5-cache/sys-devel/lld-13.0.1_rc1
+2112070210 metadata/md5-cache/sys-devel/lld-14.0.0.9999
 2110012311 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2109200110 metadata/md5-cache/sys-fabric/infinipath-psm-3.2
 2109040224 metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
@@ -57246,7 +57242,6 @@
 2110182240 metadata/md5-cache/sys-firmware/midisport-firmware-1.2-r1
 2111091344 metadata/md5-cache/sys-firmware/nvidia-firmware-340.32-r1
 2101251739 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p10
-2106220139 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
 2012120139 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p9
 2111091344 metadata/md5-cache/sys-firmware/seabios-1.12.0
 2111091344 metadata/md5-cache/sys-firmware/seabios-1.12.0-r1
@@ -57271,9 +57266,10 @@
 2111270310 metadata/md5-cache/sys-firmware/ivtv-firmware-20080701-r2
 2111270310 metadata/md5-cache/sys-firmware/zd1201-firmware-0.14-r1
 2111270310 metadata/md5-cache/sys-firmware/zd1211-firmware-1.5-r1
-2111290109 metadata/md5-cache/sys-firmware/Manifest.gz
 2111290109 metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p2
 2111290109 metadata/md5-cache/sys-firmware/tt-s2-6400-firmware-0.5.1
+2112061840 metadata/md5-cache/sys-firmware/Manifest.gz
+2112061840 metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p11
 2110312244 metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
 2111091344 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.1
 2111091344 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.2
@@ -57333,7 +57329,6 @@
 2111012110 metadata/md5-cache/sys-fs/e2fsprogs-1.46.4-r51
 2109132339 metadata/md5-cache/sys-fs/e2tools-0.1.0-r1
 2110182240 metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609-r1
-2110312244 metadata/md5-cache/sys-fs/encfs-1.9.5
 2110182240 metadata/md5-cache/sys-fs/eudev-3.2.10
 2110182240 metadata/md5-cache/sys-fs/eudev-3.2.10-r1
 2110182240 metadata/md5-cache/sys-fs/eudev-3.2.5
@@ -57467,7 +57462,6 @@
 2111210309 metadata/md5-cache/sys-fs/cryptsetup-2.4.2-r1
 2111211309 metadata/md5-cache/sys-fs/fscrypt-0.3.1
 2111221639 metadata/md5-cache/sys-fs/xfsprogs-5.10.0-r1
-2111221639 metadata/md5-cache/sys-fs/xfsprogs-5.14.0
 2111222109 metadata/md5-cache/sys-fs/lvm2-2.03.14
 2111231239 metadata/md5-cache/sys-fs/btrfs-progs-5.15.1
 2111231239 metadata/md5-cache/sys-fs/mtools-4.0.36
@@ -57483,12 +57477,14 @@
 2112031109 metadata/md5-cache/sys-fs/squashfs-tools-4.5_p20210914
 2112042109 metadata/md5-cache/sys-fs/udev-249.6
 2112031339 metadata/md5-cache/sys-fs/xfsprogs-5.14.1
-2112060609 metadata/md5-cache/sys-fs/Manifest.gz
 2112060609 metadata/md5-cache/sys-fs/dfc-3.1.1
 2112060439 metadata/md5-cache/sys-fs/fuse-3.10.5
 2112052309 metadata/md5-cache/sys-fs/mergerfs-2.33.1
-2112052209 metadata/md5-cache/sys-fs/multipath-tools-0.8.7
-2112052139 metadata/md5-cache/sys-fs/udisks-2.9.4
+2112071040 metadata/md5-cache/sys-fs/Manifest.gz
+2112071009 metadata/md5-cache/sys-fs/encfs-1.9.5-r2
+2112061840 metadata/md5-cache/sys-fs/multipath-tools-0.8.7
+2112061840 metadata/md5-cache/sys-fs/udisks-2.9.4
+2112070940 metadata/md5-cache/sys-fs/xfsprogs-5.14.2
 2111091344 metadata/md5-cache/sys-kernel/bliss-initramfs-8.1.0-r1
 2111091344 metadata/md5-cache/sys-kernel/bliss-initramfs-9.3.0
 2110252309 metadata/md5-cache/sys-kernel/cryptodev-1.11
@@ -57885,11 +57881,11 @@
 2112032209 metadata/md5-cache/sys-libs/libxcrypt-4.4.25-r1
 2112032209 metadata/md5-cache/sys-libs/libxcrypt-4.4.26-r1
 2112030339 metadata/md5-cache/sys-libs/pam_wrapper-1.1.4
-2112052339 metadata/md5-cache/sys-libs/Manifest.gz
-2112052139 metadata/md5-cache/sys-libs/freeipmi-1.6.8
 2112052339 metadata/md5-cache/sys-libs/glibc-9999
 2112051939 metadata/md5-cache/sys-libs/libcap-2.61
 2112051939 metadata/md5-cache/sys-libs/libcap-9999
+2112062309 metadata/md5-cache/sys-libs/Manifest.gz
+2112062309 metadata/md5-cache/sys-libs/freeipmi-1.6.8
 2110312244 metadata/md5-cache/sys-power/RyzenAdj-0.8.2-r1
 2110201309 metadata/md5-cache/sys-power/acpi-1.7-r1
 2110300109 metadata/md5-cache/sys-power/acpi_call-1.2.2
@@ -58021,9 +58017,9 @@
 2111301039 metadata/md5-cache/sys-process/htop-3.1.2
 2112012339 metadata/md5-cache/sys-process/criu-3.15-r3
 2112020339 metadata/md5-cache/sys-process/criu-3.16.1
-2112050809 metadata/md5-cache/sys-process/Manifest.gz
 2112032239 metadata/md5-cache/sys-process/at-3.2.2-r4
-2112050809 metadata/md5-cache/sys-process/nmon-16m
+2112070940 metadata/md5-cache/sys-process/Manifest.gz
+2112070940 metadata/md5-cache/sys-process/nmon-16m
 2109040224 metadata/md5-cache/virtual/acl-0-r2
 2104060140 metadata/md5-cache/virtual/awk-1
 2108131839 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
@@ -58508,8 +58504,12 @@
 2112022309 metadata/md5-cache/www-client/opera-developer-83.0.4246.0
 2112031039 metadata/md5-cache/www-client/chromium-97.0.4692.36
 2112030109 metadata/md5-cache/www-client/microsoft-edge-dev-98.0.1089.1
-2112052209 metadata/md5-cache/www-client/Manifest.gz
-2112052209 metadata/md5-cache/www-client/dillo-3.1_pre20181005
+2112070940 metadata/md5-cache/www-client/Manifest.gz
+2112070940 metadata/md5-cache/www-client/dillo-3.1_pre20181005
+2112061840 metadata/md5-cache/www-client/firefox-91.4.0
+2112061909 metadata/md5-cache/www-client/firefox-95.0
+2112061840 metadata/md5-cache/www-client/firefox-bin-91.4.0
+2112061840 metadata/md5-cache/www-client/firefox-bin-95.0
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 2109040224 metadata/md5-cache/www-misc/bookmarksync-0.3.4-r3
 2111091344 metadata/md5-cache/www-misc/buku-4.6-r1
@@ -58534,8 +58534,8 @@
 2109040224 metadata/md5-cache/www-misc/wsmake-0.6.4-r1
 2111120809 metadata/md5-cache/www-misc/xxv-1.6.1-r3
 2111271910 metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r2
-2112060110 metadata/md5-cache/www-misc/Manifest.gz
-2112060110 metadata/md5-cache/www-misc/monitorix-3.13.1
+2112061439 metadata/md5-cache/www-misc/Manifest.gz
+2112061439 metadata/md5-cache/www-misc/monitorix-3.13.1
 2109240040 metadata/md5-cache/www-plugins/browserpass-3.0.7
 2111172339 metadata/md5-cache/www-plugins/chrome-binary-plugins-96.0.4664.45
 2109040224 metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
@@ -58708,8 +58708,8 @@
 2112011839 metadata/md5-cache/x11-apps/xwd-1.0.8
 2112011839 metadata/md5-cache/x11-apps/xwininfo-1.1.5
 2112011839 metadata/md5-cache/x11-apps/xwud-1.0.5-r1
-2112052209 metadata/md5-cache/x11-apps/Manifest.gz
-2112052209 metadata/md5-cache/x11-apps/luit-20210218
+2112070940 metadata/md5-cache/x11-apps/Manifest.gz
+2112070940 metadata/md5-cache/x11-apps/luit-20210218
 2104060140 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2005190009 metadata/md5-cache/x11-base/xorg-drivers-9999
 2111180209 metadata/md5-cache/x11-base/xorg-proto-2021.5
@@ -59133,7 +59133,6 @@
 2109040224 metadata/md5-cache/x11-misc/set_opacity-1.0
 2109040224 metadata/md5-cache/x11-misc/set_opacity-9999
 2110312244 metadata/md5-cache/x11-misc/shutter-0.99
-2110312244 metadata/md5-cache/x11-misc/shutter-0.99.2
 2109040224 metadata/md5-cache/x11-misc/simpleswitcher-20191008
 2109040224 metadata/md5-cache/x11-misc/simpleswitcher-99999999
 2109040224 metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
@@ -59322,9 +59321,10 @@
 2112032039 metadata/md5-cache/x11-misc/grub2-theme-preview-2.4.2
 2112031609 metadata/md5-cache/x11-misc/rofi-1.7.2
 2112031609 metadata/md5-cache/x11-misc/rofi-99999
-2112060110 metadata/md5-cache/x11-misc/Manifest.gz
 2112060110 metadata/md5-cache/x11-misc/dunst-1.7.2
-2112052209 metadata/md5-cache/x11-misc/fbpager-20090221-r2
+2112070940 metadata/md5-cache/x11-misc/Manifest.gz
+2112070940 metadata/md5-cache/x11-misc/fbpager-20090221-r2
+2112061439 metadata/md5-cache/x11-misc/shutter-0.99.2
 2109040224 metadata/md5-cache/x11-plugins/allin1-0.5.0-r2
 2110012311 metadata/md5-cache/x11-plugins/asapm-3.1-r1
 2109040224 metadata/md5-cache/x11-plugins/asclock-2.0.12-r3
@@ -59552,8 +59552,8 @@
 2111301109 metadata/md5-cache/x11-terms/rxvt-unicode-9.30
 2112020339 metadata/md5-cache/x11-terms/lilyterm-0.9.9.4-r2
 2112020339 metadata/md5-cache/x11-terms/lilyterm-99999
-2112050839 metadata/md5-cache/x11-terms/Manifest.gz
-2112050839 metadata/md5-cache/x11-terms/sakura-3.8.3
+2112070940 metadata/md5-cache/x11-terms/Manifest.gz
+2112070940 metadata/md5-cache/x11-terms/sakura-3.8.3
 2110312244 metadata/md5-cache/x11-themes/QGnomePlatform-0.8.0
 2111111409 metadata/md5-cache/x11-themes/QGnomePlatform-0.8.1
 2110012311 metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
@@ -59888,4 +59888,4 @@
 2111190939 metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.2
 2111202139 metadata/md5-cache/xfce-extra/Manifest.gz
 2111202139 metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.7.0
-2112060939 metadata/md5-cache/Manifest.gz
+2112071409 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fe0c2155ce6a..06cf82812742 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Dec 2021 07:00:01 +0000
+Tue, 07 Dec 2021 15:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 813758760409..9db51f0027cd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c91aab7ed97c3970611e11f91e4c83a230db5b98 1638772363 2021-12-06T06:32:43+00:00
+9b4ee34b6dca38296dc45146bfc5cec27d6dfc89 1638887595 2021-12-07T14:33:15+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 97a88f7db722..a545db2a63b7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1638772501 Mon 06 Dec 2021 06:35:01 AM UTC
+1638887701 Tue 07 Dec 2021 02:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 35f4ee390dbd..61d39a8868cd 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Dec 2021 06:39:13 +0000
+Tue, 07 Dec 2021 14:39:11 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 31326d64d1e1..25d48debcb9f 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
new file mode 100644
index 000000000000..a4318834ba4e
--- /dev/null
+++ b/net-analyzer/dsniff/Manifest
@@ -0,0 +1,7 @@
+AUX dsniff-2.4_beta1_p30-httppostfix.patch 635 BLAKE2B 1bec7f7441b80b4c3e965395d8b81a47a0b2df1eaa6b54aad3afc4e18a862e191e2cc03f7f2d85f34c819b800a0e54dc38f9d139d5c25f48181695eaedeb6566 SHA512 40c02577a4f1bb0cfdd93019ce968751dbdb55af059dd4537c9eea7103e6d5c89e34bf7bf934a259dd4cf0b78b4a76a7d2cfc44ce2a75eee0e1f460e8defbd04
+AUX dsniff-2.4_beta1_p30-libdir-configure.patch 3810 BLAKE2B dfa3813f013bd3ec0a527ed48d57d545f439dea42243798c8bd85672d17f57391a74c7d86fb87bab88233b45531acef3ee4c8b7b4398208df1deae091dc1e382 SHA512 80719d441ea45a78b3bab7f0fb5747f88d7cd8dc8c96ffc3ec2ffcb6f5ac02f8c889a8538b0ed8b82146cd7200efefd7318950372f27e6d28fd1dff72934e558
+AUX dsniff-2.4_beta1_p30-respect-AR.patch 508 BLAKE2B 585b4e0b959b037f695e191577db9ad99f41e579d1f047810999dfa39101380235b8641e9893ff9de323b00c2376c3cf96b2ba5788786c03d05df7748038c688 SHA512 2a408236f750d47b68b883d55dcf3bb0a2b50c74cf636f2aa61999972081ce6f96186a4fd6fa566928b3d0bbe2dcc14c0f715701e2b4ec417e8f9f5cc0d154e3
+DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64
+DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a
+EBUILD dsniff-2.4_beta1_p30.ebuild 1716 BLAKE2B 604355e16c5721effd2188c483816bf9c3b28c8ffdd3f132c4e6d311852bf158df21436c53fd4c75080d4d82d404124a1a6ca5520cf9c98d52d388ef06263e74 SHA512 41177a0f130770934bfd7c8eb7fdc7d802561f097c6b7e075f78aa37bdd106b61e21988f6228807e50f3530963cb6acf982001ac67f448e9083e24931537ba5c
+MISC metadata.xml 852 BLAKE2B c391a5fcfe580499b3293b9d74ff563a0e919908b91e493bdee2b718811f16b907156d3f2589f12d1d4303034585bf3979d6943d5fb7a261e72537846421ce5a SHA512 a6f4539e1a85d88915a81b3141e52759140b19f38fc2e89349d8c679e5d2d9261325f71299b2c419572359077a053f09f02172266abb0da72623e98f1e0122de
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
new file mode 100644
index 000000000000..adb46e181081
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_p*/}"
+MY_PV="$(ver_rs 1 '.' "${MY_PV}")"
+# 2.4_beta1_p30 -> 2.4beta1-30
+MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)"
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="https://monkey.org/~dugsong/dsniff/"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz
+	mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${P/_beta1*/}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+# There's a berkdb configure option but we get a build failure if
+# we try to disable it. Not clear how useful the package is
+# without it anyway.
+RDEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.1.2.1-r1
+	>=net-libs/libnids-1.21
+	net-libs/libnsl:=
+	net-libs/libtirpc:=
+	dev-libs/openssl:=
+	>=sys-libs/db-4:=
+	X? ( x11-libs/libXmu )"
+DEPEND="${DEPEND}
+	net-libs/rpcsvc-proto"
+# Calls rpcgen during build
+BDEPEND="net-libs/rpcsvc-proto"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/
+	"${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch
+	"${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch
+	"${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	tc-export AR
+
+	econf \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install install_prefix="${D}"
+
+	dodir /etc/dsniff
+	cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+		"${ED}"/etc/dsniff/ || die
+	dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch
new file mode 100644
index 000000000000..487e45321662
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch
@@ -0,0 +1,21 @@
+Allow mixed case in some fields.
+--- a/decode_http.c
++++ b/decode_http.c
+@@ -139,14 +139,14 @@
+ 				host = p;
+ 			}
+ 			else if (req[0] == 'P') {
+-				if (strncmp(p, "Content-type: ", 14) == 0) {
+-					if (strncmp(p + 14, "application/"
++				if (strncasecmp(p, "Content-type: ", 14) == 0) {
++					if (strncasecmp(p + 14, "application/"
+ 						    "x-www-form-urlencoded",
+ 						    33) != 0) {
+ 						query = NULL;
+ 					}
+ 				}
+-				else if (strncmp(p, "Content-length: ", 16) == 0) {
++				else if (strncasecmp(p, "Content-length: ", 16) == 0) {
+ 					p += 16;
+ 					i = atoi(p);
+ 					if ((msg = buf_tok(&inbuf, NULL, i)) == NULL)
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch
new file mode 100644
index 000000000000..a2309cd836e8
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch
@@ -0,0 +1,105 @@
+Respect libdir rather than always using 'lib'.
+--- a/configure.in
++++ b/configure.in
+@@ -127,13 +127,13 @@ AC_ARG_WITH(db,
+     if test -f ${dir}/include/db_185.h; then
+        AC_DEFINE(HAVE_DB_185_H)
+        DBINC="-I${dir}/include"
+-       DBLIB="-L${dir}/lib -ldb"
++       DBLIB="-L${dir}/${libdir#${prefix}} -ldb"
+        have_db=yes
+        break
+     elif test -f ${dir}/include/db.h; then
+        AC_DEFINE(HAVE_DB_H)
+        DBINC="-I${dir}/include"
+-       DBLIB="-L${dir}/lib -ldb"
++       DBLIB="-L${dir}/${libdir#${prefix}} -ldb"
+        have_db=yes
+        break
+     fi
+@@ -178,11 +178,11 @@ AC_ARG_WITH(libpcap,
+ 	PCAPLIB="-L$withval -lpcap"
+      elif test -f $withval/include/pcap.h -a \
+ 	       -f $withval/include/net/bpf.h -a \
+-	       -f $withval/lib/libpcap.a; then
++	       -f $withval/${libdir#${prefix}}/libpcap.a; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	PCAPINC="-I$withval/include"
+-	PCAPLIB="-L$withval/lib -lpcap"
++	PCAPLIB="-L$withval/${libdir#${prefix}} -lpcap"
+      else
+         AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval)
+      fi
+@@ -190,7 +190,7 @@ AC_ARG_WITH(libpcap,
+   esac ],
+ [ if test -f ${prefix}/include/pcap.h; then
+      PCAPINC="-I${prefix}/include"
+-     PCAPLIB="-L${prefix}/lib -lpcap"
++     PCAPLIB="-L${prefix}/${libdir#${prefix}} -lpcap"
+   elif test -f /usr/include/pcap/pcap.h; then
+      PCAPINC="-I/usr/include/pcap"
+      PCAPLIB="-lpcap"
+@@ -226,7 +226,7 @@ AC_ARG_WITH(libnet,
+ 	   CFLAGS="$CFLAGS `libnet-config --defines`"
+ 	fi
+ 	LNETINC="-I$withval/include"
+-	LNETLIB="-L$withval/lib -lnet"
++	LNETLIB="-L$withval/${libdir#${prefix}} -lnet"
+      else
+         AC_ERROR(libnet.h or libnet.a not found in $withval)
+      fi
+@@ -235,7 +235,7 @@ AC_ARG_WITH(libnet,
+ [ if test -f ${prefix}/include/libnet.h; then
+      CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
+      LNETINC="-I${prefix}/include"
+-     LNETLIB="-L${prefix}/lib -lnet"
++     LNETLIB="-L${prefix}/${libdir#${prefix}} -lnet"
+   elif test -f /usr/include/libnet.h; then
+      CFLAGS="$CFLAGS `libnet-config --defines`"
+      LNETLIB="-lnet"
+@@ -267,7 +267,7 @@ AC_ARG_WITH(libnids,
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	NIDSINC="-I$withval/include"
+-	NIDSLIB="-L$withval/lib -lnids"
++	NIDSLIB="-L$withval/${libdir#${prefix}} -lnids"
+      else
+         AC_ERROR(nids.h or libnids.a not found in $withval)
+      fi
+@@ -275,7 +275,7 @@ AC_ARG_WITH(libnids,
+   esac ],
+ [ if test -f ${prefix}/include/nids.h; then
+      NIDSINC="-I${prefix}/include"
+-     NIDSLIB="-L${prefix}/lib -lnids"
++     NIDSLIB="-L${prefix}/${libdir#${prefix}} -lnids"
+   elif test -f /usr/include/nids.h; then
+      NIDSLIB="-lnids"
+   else
+@@ -309,11 +309,11 @@ AC_ARG_WITH(openssl,
+ 	SSLINC="-I$withval/include"
+ 	SSLLIB="-L$withval -lssl -lcrypto"
+      elif test -f $withval/include/openssl/ssl.h -a \
+-	       -f $withval/lib/libssl.a; then
++	       -f $withval/${libdir#${prefix}}/libssl.a; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	SSLINC="-I$withval/include"
+-	SSLLIB="-L$withval/lib -lssl -lcrypto"
++	SSLLIB="-L$withval/${libdir#${prefix}} -lssl -lcrypto"
+      else
+         AC_ERROR(ssl.h or libssl.a not found in $withval)
+      fi
+@@ -322,10 +322,10 @@ AC_ARG_WITH(openssl,
+   esac ],
+ [ if test -f ${prefix}/include/openssl/ssl.h; then
+      SSLINC="-I${prefix}/include"
+-     SSLLIB="-L${prefix}/lib -lssl -lcrypto"
++     SSLLIB="-L${prefix}/${libdir#${prefix}} -lssl -lcrypto"
+   elif test -f ${prefix}/ssl/include/openssl/ssl.h; then
+      SSLINC="-I${prefix}/ssl/include"
+-     SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto"
++     SSLLIB="-L${prefix}/ssl/${libdir#${prefix}} -lssl -lcrypto"
+   elif test -f /usr/include/openssl/ssl.h; then
+      SSLLIB="-lssl -lcrypto"
+   else
diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch
new file mode 100644
index 000000000000..fd2235fada7d
--- /dev/null
+++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch
@@ -0,0 +1,22 @@
+Respect the 'AR' environment variable.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -103,7 +103,7 @@ $(LIBOBJS):
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c
+ 
+ libmissing.a: $(LIBOBJS)
+-	ar -cr $@ $(LIBOBJS)
++	$(AR) -cr $@ $(LIBOBJS)
+ 	$(RANLIB) $@
+ 
+ dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a
+--- a/configure.in
++++ b/configure.in
+@@ -17,6 +17,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AC_CHECK_PROG(AR,ar,ar)
+ 
+ dnl Checks for header files.
+ AC_PATH_XTRA
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
new file mode 100644
index 000000000000..32fb662b8379
--- /dev/null
+++ b/net-analyzer/dsniff/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
+		dsniff is a collection of tools for network auditing and penetration testing.
+		dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
+		network for interesting data (passwords, e-mail, files, etc.). arpspoof,
+		dnsspoof, and macof facilitate the interception of network traffic normally
+		unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
+		implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
+		sessions by exploiting weak bindings in ad-hoc PKI.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index f5330d3f1101..3d6419b7eb82 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,15 +1,12 @@
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
+AUX wireshark-3.6.0-fix-no-tshark.patch 1133 BLAKE2B 05172dd9379550dd50e853e1cbc4c0a4958bdcecd62f9aa1148cfee73e42ff2ec73113cec102d885405235c62e539939d5b786975f74bdea201a07f0b2ada7bc SHA512 532c239c9d9e2a1eaea995b276361cf8e21a52c5577dd5de04ca1ac4d520a0a4dce61f08eef245b60c8162a7ad9a2cef7519444aa8ab0d900774932da1314829
 AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563 SHA512 8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
-DIST wireshark-3.4.7.tar.xz 32311140 BLAKE2B 0a6112ed667739935417350660e31d64747cb81295db058e0a27c38387b2ed2b9806f8d61925c262d531fb96d87e230d1cd5d511ae0bdba973373835bf5d7bc5 SHA512 26546828d26f0fef1021ae9fccf5c3f1d7cb3bd05ce63ec37259a1938546ec427415d542fe985c11f95055f7677a19b010be57c7082848714b1755565f092ed0
-DIST wireshark-3.4.8.tar.xz 32314976 BLAKE2B bdd70b77b2582339fc563c91596b0419789f08c6a9e4895910cc703ba5726229acceeccdcf41b3c5831df711f3d635217f123759b86055d1b03742afed7c68e5 SHA512 962ab4d85ca0686c69470a63e516c0e46fbd8f9eb09e1c5f689f37b5c804c6da3e50b96144adc8e2bff6af67e1c9435db54581c8f1ec5908e27e348691bda1c8
 DIST wireshark-3.4.9.tar.xz 32335284 BLAKE2B 95b3e6804225af7043fa1f4e5dc53785d939b56c81983a010a579c61b10eed989e695601c7ac67eb3aa00f9314236dd03e1e9ebb35c17ca81b832bad654523de SHA512 479abcf7b44504a269b73201da5aabac0d7770cd779a325df3214b6df5dc37e175f2889165a933c2902001a06c8141768f35cd8ca35cc55fc6cf30a482ea27eb
 DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 EBUILD wireshark-3.4.10.ebuild 7362 BLAKE2B 1aa51cc5aabda25aaba2d339d2a47e9b350addb1fdaf3be3b28d2cd920940291a7a045609f092de07934f9010cf0ee72560c97ddea07f827a274c391b27aae80 SHA512 5bb8dbb307ef8037b8c54dc6d58ce00c2093a61a5855e6b686efc08e1bd24249ed7dfef8e27dde9af2bc8d543fda0f5f9463ef84e0a8d718c1296e53bd02f0af
-EBUILD wireshark-3.4.7-r1.ebuild 7218 BLAKE2B 455d0e7f02eeacc08e69f0fd9783ccb72268904f87588a9196ed5b8b6cc813a81b5ec7da2bccb253c3c938462082e3457dde1c3bf44b99c18c7688f914f3acf4 SHA512 a90633a35895f79526a6d56380fc4930159a0e2c315b8f4fed800a8dd707fc377350311b64cb251d9591983b3d864d546eb1c7076bcc5c6f28053cb7e15bc0d6
-EBUILD wireshark-3.4.8.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
 EBUILD wireshark-3.4.9.ebuild 7266 BLAKE2B a25fc049d2b849bc87b8e2237a79c1d26a9ce29f39429a9fc7d1f50a2f4248a3c245dd7ceee36cf508a35789becb91faaac9cd74418e9ffa8413b0bda7bd0be4 SHA512 ce1533bd0618150d5640d35cd6711c5c596ef839c8f63b610d3a493d2e2c80ef70ad7320897c213d3879cb2df72f1fbb665054c6bcb6960ee67d608efc113283
-EBUILD wireshark-3.6.0-r1.ebuild 7258 BLAKE2B 7965cbdbb122ba5a0ce3c27fc9fa86e084280d3a60e2f04997d7db87fd4bdcd9454d96693891d300a5b6a7a07ca3a58df29f4cc7dafc7705770f78cf9a3b9a38 SHA512 48534b6a1111d27a670a051fc25b3a019ebae54d571695bf1017df6d20de288e017564723528c5b8ee410b155c32cedbb7e0073828b5c6935f21c78181eabbfb
-EBUILD wireshark-9999.ebuild 7258 BLAKE2B 7965cbdbb122ba5a0ce3c27fc9fa86e084280d3a60e2f04997d7db87fd4bdcd9454d96693891d300a5b6a7a07ca3a58df29f4cc7dafc7705770f78cf9a3b9a38 SHA512 48534b6a1111d27a670a051fc25b3a019ebae54d571695bf1017df6d20de288e017564723528c5b8ee410b155c32cedbb7e0073828b5c6935f21c78181eabbfb
+EBUILD wireshark-3.6.0-r1.ebuild 7194 BLAKE2B ee063210f9a474a430450a4cb12e1d84dfd0524aacecdfc9b7246f11a87371c97e8e60785833b16abc249637aa2f41d5d489b70e8ca4949c4dbf19a93a9f9334 SHA512 4a698d68038b1f88b5bb9a48e355d6f88cda2d0b0aa81cd9e406e1d6ddc849dc9436687f759c51d683e2fa4cd32db4baab0b50c3d6d82c0d1629df44acfb9d27
+EBUILD wireshark-9999.ebuild 7147 BLAKE2B 9cd3d25b9971cee38c819ce123b4a8ede25f06f8d3482db1b0be8e2135976cb721ba8719f6e1256386ce842c8db103cee42c22750258b81479d269cabccae781 SHA512 81f04c18ad41bd4c265e9a970599f828a2366aa89368c7b179cc8c7f7f93ed8214fc2ee93a126abe031838ba2be0c2189519f3a7eb38c0f3a23ca0e4e433368c
 MISC metadata.xml 5328 BLAKE2B a030872929b89f0ead3794d8bbff20354b3a1b7a35aa7c3ce37baf5170ced9d39bdc665bd23e03e70d94550085a88224ec6cd260679b2d01501b272c595442d0 SHA512 cbadc90c858ef008b763253ef548e3634643b98bf90069b3fa34bd4f947d93ee8d4a2f3c6d9c7fe4c93b4169e34681e00905b28e64f8edcff02f23867d75b265
diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
new file mode 100644
index 000000000000..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
+https://gitlab.com/wireshark/wireshark/-/issues/17766
+https://bugs.gentoo.org/823720
+
+From: Gerald Combs <gerald@wireshark.org>
+Date: Mon, 6 Dec 2021 19:01:10 -0800
+Subject: [PATCH] CMake: Remove the update_tools_help target.
+
+Remove the update_tools_help target. Despite the comment, the weekly
+update job doesn't use it, we don't have targets for our other update
+scripts, and it currently causes issues if BUILD_tshark is disabled.
+Fixes #17766.
+--- a/docbook/CMakeLists.txt
++++ b/docbook/CMakeLists.txt
+@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
+ 
+ set(GUIDE_INSTALL_DIRS)
+ 
+-# This is automatically updated each week. You probably don't need to run it
+-# or depend on it.
+-add_custom_target(update_tools_help
+-	COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
+-		${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
+-		--program-path $<TARGET_FILE_DIR:tshark>
+-	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-)
+-set_docbook_target_properties(update_tools_help)
+-
+ set(WSUG_TITLE "Wireshark User's Guide")
+ 
+ set(WSUG_FILES
+GitLab
diff --git a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild b/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
deleted file mode 100644
index f0021c067742..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.7-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=(
-		--disable-capture
-		--skip-missing-programs=all
-		--verbose
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]]; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.4.8.ebuild b/net-analyzer/wireshark/wireshark-3.4.8.ebuild
deleted file mode 100644
index 68cb4ab7a929..000000000000
--- a/net-analyzer/wireshark/wireshark-3.4.8.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-# bug #753062 for speexdsp
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-	"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=(
-		--disable-capture
-		--skip-missing-programs=all
-		--verbose
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
-
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		epan/wmem
-		wiretap
-		wsutil
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	#with the above this really shouldn't be needed, but things may be looking
-	# in wiretap/ instead of wireshark/wiretap/
-	insinto /usr/include/wiretap
-	doins wiretap/wtap.h
-
-	if use qt5; then
-		local s
-		for s in 16 32 48 64 128 256 512 1024; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]]; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
index 145ec1e5d572..cd262a13d500 100644
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -30,12 +30,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )"
+
 RESTRICT="!test? ( test )"
 
 # bug #753062 for speexdsp
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
+RDEPEND="acct-group/pcap
+	>=dev-libs/glib-2.38:2
 	>=net-dns/c-ares-1.5:=
 	dev-libs/libgcrypt:=
 	media-libs/speexdsp
@@ -70,18 +72,12 @@ CDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
-	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -93,21 +89,15 @@ BDEPEND="
 	test? (
 		dev-python/pytest
 		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
+	)"
+RDEPEND="${RDEPEND}
 	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
+	selinux? ( sec-policy/selinux-wireshark )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
 	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+	"${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch
 )
 
 pkg_setup() {
@@ -119,7 +109,7 @@ src_configure() {
 
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
+	if use kerberos ; then
 		case $(krb5-config --libs) in
 			*-lcrypto*)
 				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
@@ -130,7 +120,7 @@ src_configure() {
 		esac
 	fi
 
-	if use qt5; then
+	if use qt5 ; then
 		export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
@@ -237,19 +227,21 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	if use qt5; then
+	if use qt5 ; then
 		local s
-		for s in 16 32 48 64 128 256 512 1024; do
+
+		for s in 16 32 48 64 128 256 512 1024 ; do
 			insinto /usr/share/icons/hicolor/${s}x${s}/apps
 			newins image/wsicon${s}.png wireshark.png
 		done
+
 		for s in 16 24 32 48 64 128 256 ; do
 			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
 			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
 		done
 	fi
 
-	if [[ -d "${ED}"/usr/share/appdata ]]; then
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
 		rm -r "${ED}"/usr/share/appdata || die
 	fi
 }
@@ -262,7 +254,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
-	if use dumpcap && use pcap; then
+	if use dumpcap && use pcap ; then
 		fcaps -o 0 -g pcap -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 145ec1e5d572..3b3d7769e8ea 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -30,12 +30,14 @@ IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +rand
 IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-ifdemo? ( plugins )"
+
 RESTRICT="!test? ( test )"
 
 # bug #753062 for speexdsp
-CDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.32:2
+RDEPEND="acct-group/pcap
+	>=dev-libs/glib-2.38:2
 	>=net-dns/c-ares-1.5:=
 	dev-libs/libgcrypt:=
 	media-libs/speexdsp
@@ -70,18 +72,12 @@ CDEPEND="
 	sshdump? ( >=net-libs/libssh-0.6 )
 	ssl? ( net-libs/gnutls:= )
 	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
+	zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	dev-lang/perl
-	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -93,17 +89,10 @@ BDEPEND="
 	test? (
 		dev-python/pytest
 		dev-python/pytest-xdist
-	)
-"
-RDEPEND="
-	${CDEPEND}
+	)"
+RDEPEND="${RDEPEND}
 	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )
-"
+	selinux? ( sec-policy/selinux-wireshark )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
@@ -119,7 +108,7 @@ src_configure() {
 
 	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
 	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos; then
+	if use kerberos ; then
 		case $(krb5-config --libs) in
 			*-lcrypto*)
 				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
@@ -130,7 +119,7 @@ src_configure() {
 		esac
 	fi
 
-	if use qt5; then
+	if use qt5 ; then
 		export QT_MIN_VERSION=5.3.0
 		append-cxxflags -fPIC -DPIC
 	fi
@@ -237,19 +226,21 @@ src_install() {
 		doins ${dir}/*.h
 	done
 
-	if use qt5; then
+	if use qt5 ; then
 		local s
-		for s in 16 32 48 64 128 256 512 1024; do
+
+		for s in 16 32 48 64 128 256 512 1024 ; do
 			insinto /usr/share/icons/hicolor/${s}x${s}/apps
 			newins image/wsicon${s}.png wireshark.png
 		done
+
 		for s in 16 24 32 48 64 128 256 ; do
 			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
 			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
 		done
 	fi
 
-	if [[ -d "${ED}"/usr/share/appdata ]]; then
+	if [[ -d "${ED}"/usr/share/appdata ]] ; then
 		rm -r "${ED}"/usr/share/appdata || die
 	fi
 }
@@ -262,7 +253,7 @@ pkg_postinst() {
 	# Add group for users allowed to sniff.
 	chgrp pcap "${EROOT}"/usr/bin/dumpcap
 
-	if use dumpcap && use pcap; then
+	if use dumpcap && use pcap ; then
 		fcaps -o 0 -g pcap -m 4710 -M 0710 \
 			cap_dac_read_search,cap_net_raw,cap_net_admin \
 			"${EROOT}"/usr/bin/dumpcap
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 0c8dd8b0f3c6..a6c4a98e5812 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 6066b642f11c..fb86d4b4a14f 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -4,5 +4,5 @@ DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
 EBUILD ppp-2.4.9-r4.ebuild 7384 BLAKE2B 405c4ec32ad0e0913addd6f23bbc82222fb2e58bfee35f6ed8ce3ccd09f694559e22186c66e980dec33ce636e3cd9188660502bb8512925c1abde9c08fc20fea SHA512 19830cae579f86a05a730536198f31b5f748f12a7aaf53b61922aa030fe4c8fd31599fd78c6eb27b917de291210573e7dc437a9c5c65949683f1a7909975457a
-EBUILD ppp-2.4.9-r5.ebuild 7548 BLAKE2B b41cbb6c297abdefa87571b477d0c0b56b882986faf5aa941f6ea0f07683e855181db92e77c526dd789b7f1833073ad3430b3383e1f41489d73068e1e8b7d2a5 SHA512 4297be8a52326d5978ac3e588ea55e44992311599a4e0608fef5bd4c1482cb2fa09865d7fdb8ba1759d42ca4941a97dba4a01851d9186fd8f5ff6e7f68e306c1
+EBUILD ppp-2.4.9-r5.ebuild 7546 BLAKE2B f3f5a24b4a0ee7d706e10e1f5283d09f5622737ece4e71444336244725ddf4893269689b0c7b7f5f7b8b070186a4012eec0b68ff1cdabfc3ce21ee67aeec130e SHA512 5f886041a674f9b0ed15f40ef93475345e64d2bdd9bba5f81a6dccdc406e96d824411901b13bb10d43359eb6e6eec80a8f01a53c31b2c7df9a6bb1d1a78c9ab2
 MISC metadata.xml 1097 BLAKE2B 3d78c2f7a4c8e17834d8eb4f7763d1cc7f03154f8e5ccb5c7da948e01bc43467df928cdd0f946244d7c17bc53755962151a3e0247e802c4b42f713f415009e44 SHA512 0d1d82342808d9a599004e66874fe2b661857d0a55d2db56ef853011829dc8dc5924378364fc1069b666a9f0132617e0c00b822efecfbd82b9f54e6cee39f45c
diff --git a/net-dialup/ppp/ppp-2.4.9-r5.ebuild b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
index e01a2e65806e..6dc1478db04b 100644
--- a/net-dialup/ppp/ppp-2.4.9-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius systemd"
 
 DEPEND="
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index d4273240827e..40f9e19f5818 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -7,5 +7,5 @@ DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
 EBUILD rp-pppoe-3.14.ebuild 2299 BLAKE2B 29316862ad0f00dfd719a4af51af39fea06611b6997cf7b13e32b8c6e4a94e82cff73b51b52fcc18effae5a2500990ba87fea3ef8e7686e9465f30e1e186eccc SHA512 3d1a90c6e21f09ac4a4db7de679d12660ab204ee61480dda90a9ee9151c76c2d20f560248335b048724dacd2d3be272682309f2827fdfc885c8dbb13625ccd2e
 EBUILD rp-pppoe-3.15-r1.ebuild 2097 BLAKE2B 2f1401057ba53f1b7f290417bb7580291e8e7943e3d854c4a33ea1d6b03cf2d5bbe697066b1379959d97e5a4d2f7462cc6129bd250be6889554ceadf74830703 SHA512 489a1de583cc0b531ae6b01557f9b8af16f96e38e4677ceb0c18ddf991727f773435a54c3e1917d225af90d0ab4ec40f7fa5ed2d976e405ece8e1f0d958e6270
-EBUILD rp-pppoe-3.15.ebuild 2397 BLAKE2B 77134f0df93908173452d0aa407c053acdbe848eebbef1e9ef75a24422b0b37d8c892da49901288225559148baaaa054501c57dc12e303525fe9e735c21d28f4 SHA512 5a8603e9368048e9099ec0981e0a2912b581cd8bfef0e721ba8564f3ce4848217d665ec6708969cc35526e93cde8d94f5b0c4d256a08d7accea582a4ddbe99d5
+EBUILD rp-pppoe-3.15.ebuild 2395 BLAKE2B d485ae601932325e29c94b11d36934a6aa8dcf75e2e64e242ebb6fe766c193004b9ca904909a9990ac16cc29d5dcef89f10d842f0eda7f58e9ab1d350fa92cc6 SHA512 5a81a478d2f2042ef24e7aa6a2abe75452ac6828d0c4e29b17a09acfd2e349c9583bfa3f5a3a90f7fc35670eb5472bf57e9c657c40e4601d1e0e04528c4ddc3c
 MISC metadata.xml 370 BLAKE2B 04fa2afd30bf660d7c2ac948a09fc1fc9d40f44f0eda79432b4f0be7741dd9f4e0f104db474f94d5515f62a37363df06fb169ca246822d1d01a8980b7f393c7d SHA512 09289baac97746fb9c641bfe3be9ab9dae7f5f2f445a1e2364e89ccb4d2c81c75b70d331ccc6b23b25396e36f27ef06aa92652665ad4aedc3290d6617a4e2b17
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
index 97138c3056bf..e19ddd135a82 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="tk"
 
 RDEPEND="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c3d040b51348..56ace122cf4f 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index e372af5599ba..c07113da7ffc 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -3,5 +3,5 @@ AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b0
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
 DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
-EBUILD opendnssec-2.1.10.ebuild 6691 BLAKE2B f9cd99406b5408b5ce2e06635912c1d8fd6f279b4325264852809b21ba5a379f577bb004575cdcf09a18598e4985b280ea52a58fb492aa6ceae17452f771bacc SHA512 b6052b62fcfe746326b20792641feda1d299f8e312578402bf779f6b30fbc866a961b0f800ae80e6fa2ade66612a02211c65d0993e176e25337a105a85c568b8
+EBUILD opendnssec-2.1.10-r1.ebuild 6707 BLAKE2B 9d772453d31f360501fa387b09acdba92bde112ac0d7b1af8e240756b6bcbb2de2493e6811722166f3fbcfdd44d74291465021a69f8ea9a8141e09f7234ebfb7 SHA512 d06a78373199d72be526f626f5717bc946d8f0fdd99c4806b4d34925e4231c3c02cb05cfbd7c58f531a9176f6322686daacd7122620ec90aaa9eee4ff9e761e1
 MISC metadata.xml 718 BLAKE2B c6369b0a0f4df6fba454e7101d5254dcbd6b2294f9f6227d21d7f1defa04bde31809883d715b44c939fc9192447138d79b1955dc4964d17b0e8fc8341ab032aa SHA512 1b5144f8aca23a9798dd45a32b91fbdb37be1832d3d7b73bbafb3a3b4a7e003a00016ba84094fd662d9c0db5fe1b032a6a3e389b8c921c32fea61e5b0cd30c44
diff --git a/net-dns/opendnssec/opendnssec-2.1.10.ebuild b/net-dns/opendnssec/opendnssec-2.1.10-r1.ebuild
similarity index 98%
rename from net-dns/opendnssec/opendnssec-2.1.10.ebuild
rename to net-dns/opendnssec/opendnssec-2.1.10-r1.ebuild
index fc1cc54c2d14..210d41c8d872 100644
--- a/net-dns/opendnssec/opendnssec-2.1.10.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.10-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-lang/perl
 	dev-libs/libxml2
 	dev-libs/libxslt
-	net-libs/ldns
+	net-libs/ldns[ed25519,ed448]
 	mysql? (
 		dev-db/mysql-connector-c:0=
 		dev-perl/DBD-mysql
@@ -133,10 +133,10 @@ src_prepare() {
 }
 
 src_configure() {
+#		--localstatedir="${EPREFIX}/var/lib" \
 	econf \
 		--enable-installation-user=opendnssec \
 		--enable-installation-group=opendnssec \
-		--localstatedir="${EPREFIX}/var/lib" \
 		--without-cunit \
 		--disable-static \
 		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 5fb4b774a800..5283dc608cd9 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 04a4eba08325..414548d96638 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -5,5 +5,5 @@ AUX ipset.systemd 476 BLAKE2B 6d536142066ab60fdec24bcb138976709f186c575a7958ad9e
 DIST ipset-7.11.tar.bz2 674100 BLAKE2B 97f2e3372e963654ece511960e8c22d0dd9e29376d087a3767d89544dfbd85f9f9e75e0cc6c4eb9e1d813d1a472a410033a76feef3319b1d87fd51b0c3fd97cd SHA512 20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922
 DIST ipset-7.15.tar.bz2 680383 BLAKE2B 10acff9741370ad80a2845605be1be4f691e987b271f4dcf1fab3abfe158c63c7d39e6b3453ba7cd361dee3df92f85419cfb70806a71b6806555f6571c70b1ed SHA512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a
 EBUILD ipset-7.11-r1.ebuild 3450 BLAKE2B 214cade04c6b499a7e0043df1eec4cd475b9247b21fa1bc218503082a5265d54d93f6a388281ac7360c48de65581dd3517e49aea7022557535ff42590695795f SHA512 a8ec2d9ca9b17ba666641c6e9539714bb836e043363a5a8e0a913314b476aca59eb4fb9efd6febcc8c13bbe35962ea14bdddc510a2055d980a347e43271c6439
-EBUILD ipset-7.15.ebuild 3452 BLAKE2B 2e309448eeeadaaba76895e772f6654ad08b40966ace4c45e9b67929e0626009d2d39c7d53bce1af0b78e0de785c48bed9dc74c3baa12298e6e52a7d79d3c3da SHA512 b098c54119aaba76195cc6be76f15d4daf1827380ad588f1a5a7ff8eaa0606987f8d952d936d543c97ae7231c1a37fa2b83ac871bec525fb815a1925acdddd8f
+EBUILD ipset-7.15.ebuild 3450 BLAKE2B 214cade04c6b499a7e0043df1eec4cd475b9247b21fa1bc218503082a5265d54d93f6a388281ac7360c48de65581dd3517e49aea7022557535ff42590695795f SHA512 a8ec2d9ca9b17ba666641c6e9539714bb836e043363a5a8e0a913314b476aca59eb4fb9efd6febcc8c13bbe35962ea14bdddc510a2055d980a347e43271c6439
 MISC metadata.xml 369 BLAKE2B f41c3bdbd41f5cd6ae9451f00d80d3ca0e17343f45c37f88ab6e34dda8fce78e4d9b4d670385b3f8d9025f6065f1911d1815b610bbbbbfeb364942b8512ccc7b SHA512 f359ed08f769da53de8c31350f48b7fd0504c863fb29664ce40eac4e56f2cca842d9dc8de350fd4790a3a143ed4db6ed3df3419cc9daad4403078039ced52d3e
diff --git a/net-firewall/ipset/ipset-7.15.ebuild b/net-firewall/ipset/ipset-7.15.ebuild
index 844268fa41ad..cbee799db563 100644
--- a/net-firewall/ipset/ipset-7.15.ebuild
+++ b/net-firewall/ipset/ipset-7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index f073cf575976..9d7c1580f7a7 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 1298ba2c3532..cd45e9d213ce 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -8,5 +8,6 @@ AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aa
 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
 EBUILD ejabberd-20.04.ebuild 9084 BLAKE2B eaf5b71f770f15df5697b52aafcd06c45f7f23ceae80e488bb9d815a2b6996349470541b6d4dc94bf1a98d2f78733f39236263dd6bec70a852ee800d1f9af994 SHA512 963b849ffb6d2a6879777205a7bc84349fb379eb00b8afbd4d574c77fa276246e943c92598bfeba0badfe0a7b92e4b07c6357e0b91ca7cb49cce90c1b8653d60
+EBUILD ejabberd-21.04-r1.ebuild 7174 BLAKE2B 14d14c538af58749847e48aa5d0212536018f6a50408e9b4a543d30c5cef0ce87d76a6d1dbba645b99262ed86228ac9bd8168ab320b0fd85302c1944af047b26 SHA512 1bfc90a684db5ab4b5f9a371d0673cb26d829a3115eb0f8ef93f0fc5b9a06cf91af0b63d8456ea45a4637caa6fbfebbd9c618d2e74fceb1c94279359a12c299a
 EBUILD ejabberd-21.04.ebuild 8513 BLAKE2B d6f4f4b124f0adadf319caedbf6fe29f63423c8a1b204f9e7577f8b2752264cd754682b7ea61ada493326c41dee9d2b77f819d833a4b9179cc6f4686924ce752 SHA512 606f72c427143783f2f0555c2aca330fff0c8e10dee3e6c1c267f537d8eebaaf7ac4a6ef723e3e8cbfe900bc9b8fe91529268b08f19ecfda43e54317472ea8f2
 MISC metadata.xml 1517 BLAKE2B 5db739eeebcfcb1be6ee3fe281e40bbd3f98943c26910247fce1d491f6300b6c5e1814906838b846a2716b2a50bc8ed26219db49cd1101a9263e23d607d5afdb SHA512 a1856f7fea3d1add4503f1c3b92c6318bbfce0946f44d8e18c44be98d11e814bf56d73b626ee825787871a5adc834541853c7350709ef8204182fafd6dec1710
diff --git a/net-im/ejabberd/ejabberd-21.04-r1.ebuild b/net-im/ejabberd/ejabberd-21.04-r1.ebuild
new file mode 100644
index 000000000000..0d4324cb98e4
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.04-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+	roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.28
+	>=dev-erlang/eimp-1.0.20
+	>=dev-erlang/fast_tls-1.1.12
+	>=dev-erlang/fast_xml-1.1.46
+	>=dev-erlang/fast_yaml-1.0.31
+	>=dev-erlang/yconf-1.0.11
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/lager-3.6.10
+	>=dev-erlang/p1_oauth2-0.6.9
+	>=dev-erlang/p1_utils-1.0.22
+	>=dev-erlang/stringprep-1.0.25
+	>=dev-erlang/xmpp-1.5.3
+	>=dev-erlang/pkix-1.0.7
+	>=dev-erlang/mqtree-1.0.13
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/p1_acme-1.0.12
+	>=dev-erlang/base64url-1.0.1
+	>=net-im/jabber-base-0.01
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.10 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
+	redis? ( >=dev-erlang/eredis-1.0.8 )
+	sip? ( >=dev-erlang/esip-1.0.42 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.12 )
+	stun? ( >=dev-erlang/stun-1.0.43 )
+	zlib? ( >=dev-erlang/ezlib-1.0.9 )"
+RDEPEND="${DEPEND}
+	acct-user/ejabberd
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+	"${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+	local epam_wrapper_src="${1}"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+}
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+	sed -r \
+		-e 's!@ctlscriptpath@!/usr/sbin!g' \
+		-e 's!^(After)=(.*)!\1=epmd.service network.target!' \
+		-e '/^After=/ a Requires=epmd.service' \
+		"${PN}.service.template" >"${PN}.service" \
+		|| die 'failed to make ejabberd.service'
+}
+
+src_prepare() {
+	default
+
+	rebar_remove_deps
+	correct_ejabberd_paths
+	make_ejabberd_service
+	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-user=${PN} \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	emake REBAR='rebar -v' src
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	# /var/lock/ejabberdctl is unused, see
+	# https://github.com/processone/ejabberd/pull/3724
+	rmdir "${ED}/var/lock/ejabberdctl" || die
+	rmdir "${ED}/var/lock" || die
+
+	keepdir /var/{lib,log}/ejabberd
+}
+
+pkg_preinst() {
+	if use pam; then
+		einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \
+			"authentication"
+		# See
+		# <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
+		# epam binary is installed by dev-erlang/epam package, therefore SUID
+		# is set by that package. Instead of jabber group it uses epam group,
+		# therefore we need to add jabber user to epam group.
+		usermod -a -G epam ejabberd || die
+	fi
+}
+
+pkg_postinst() {
+	local migrate_to_etc_ejabberd=false
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "For configuration instructions, please see"
+		elog "  https://docs.ejabberd.im/"
+		echo
+	else
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 21.04-r1; then
+				migrate_to_etc_ejabberd=true
+				break
+			fi
+		done
+	fi
+
+	# Sarting with >=21.04-r1, the ejabberd configuration is now in
+	# /etc/ejabberd and no longer in /etc/jabber. See if we need to
+	# migrate the configuration. Furthermore, ejabberd no longer runs
+	# under the, shared via net-im/jabber-base, 'jabber' use, but under
+	# its own user. This increase isolation and hence robustness and
+	# security.
+	if $migrate_to_etc_ejabberd; then
+		cp -r "${EROOT}"/etc/jabber/. "${EROOT}"/etc/ejabberd || die
+		if [[ -f "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 ]]; then
+			rm "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 || die
+		fi
+		if ! use prefix; then
+			chown --recursive ejabberd:ejabberd "${EROOT}"/etc/ejabberd || die
+		fi
+		elog "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+		elog "(just as upstream) and *not* /etc/ejabber."
+		elog "The files from /etc/jabber where copied to /etc/ejabberd."
+		elog "Please check your configuration and delete the file in /etc/jabber."
+	fi
+}
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 2b886cd6f55f..b37e45759a4b 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.6.0.x86_64.rpm 58643360 BLAKE2B 23e630112c8c28d39dbeb6824aa75d7289ad59e6cf061f2e61165511e2f57062832fb4ec64d9c985b1de94b0a28025b7f374d2a1428bc72eb6259f80cf79428d SHA512 8cc6b6842f9bdc3d13c4d293aa1aa75daba2bc66fab1262c051407fbe686fac1980e0abba3ccfa8d7cc6d96fc6391e24101b6baa9af3751edf4bf680968df142
-EBUILD rocketchat-desktop-bin-3.6.0.ebuild 1074 BLAKE2B c550bb783cf67c5e7d18896258360e4d6621fd8439aac7742f99b4792a667b9061eecc29ff9b0798febe809e785a952c2f8deaf5c2589bc551f053042a6d7fa2 SHA512 cd5e05036880fa65d35ae2cd109b88c6a8a5824bc3ec13d37538e804cf0cf309bd3ef8d7f990c8a63f85fbdcc30c4a510a1aef61face5364a86eddec09515913
+DIST rocketchat-3.7.0.x86_64.rpm 72048484 BLAKE2B c7f2d81df1cde64caf0699ac706891bd3d5bb38a976354abb344a6ea65f465fb32ceeb08c445621f5a65eda1b886b836520095ee295f7c1c6dd32ab498ea77ff SHA512 c4574520bdb60666eefde5899e304b65dc7cc9eb2cce7221d84cef6e3d003ecee0630c2175357591b5545d682be16c7bade490f37df86f80db1948c30a50e52c
+EBUILD rocketchat-desktop-bin-3.7.0.ebuild 1074 BLAKE2B c550bb783cf67c5e7d18896258360e4d6621fd8439aac7742f99b4792a667b9061eecc29ff9b0798febe809e785a952c2f8deaf5c2589bc551f053042a6d7fa2 SHA512 cd5e05036880fa65d35ae2cd109b88c6a8a5824bc3ec13d37538e804cf0cf309bd3ef8d7f990c8a63f85fbdcc30c4a510a1aef61face5364a86eddec09515913
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.6.0.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.0.ebuild
similarity index 100%
rename from net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.6.0.ebuild
rename to net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2730c3c4ead8..4573ce7166f0 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 7a5e6ca89993..9d9ebd215318 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -3,5 +3,5 @@ DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b
 DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
 DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f
 EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
-EBUILD canlock-3.2.2.ebuild 1097 BLAKE2B 9dd92e1295f281b1deefd2d5437e1c4ad6a93e3b3ead1d0f5cca433081b59cc7bbedb08b1a29d77be932d552d828dcad26b8959983066966ea8d4105b2ff16a6 SHA512 f260ec9c6d11fa1377726395f7fee0ff8e9dfa8be8ece1437af746e7b1f9ecc56e2b20cb56a64872bbdeac2b2e22937e66a4436981a74f45992f9d330712990c
+EBUILD canlock-3.2.2.ebuild 1096 BLAKE2B e3e9328d88fe17355f37d2ef03d641a01732b2665f10bec401395435ec25c4209f069e148ebaf285c954bf05decbf0c7d0527c35e243d77a3e6ec41ed9b25fb7 SHA512 c4e5305622e8e97217a48e0895bb5e4239f0832e539029069932a636c367f70b4888ebd2c4b65b2963045638d8849e070cd06099219966988a9c5df28aa037cf
 MISC metadata.xml 431 BLAKE2B cd7cbf3191ed305dd69b9cb360da7f45d7e5e7656080328c8c152c0b1761e390d2657265bc83093758e3f6628a6a1570080d42b9e432e4b2a900a354448194fb SHA512 e6317ceb5e1fba639fa9c095e726267cfcda9284c0b075a66eca95991bc01a54e7d2891b238e00924127988be5280a6467ddb64fb386e959966d43b5a05f0542
diff --git a/net-libs/canlock/canlock-3.2.2.ebuild b/net-libs/canlock/canlock-3.2.2.ebuild
index 86a17d2cbeae..34082394f4af 100644
--- a/net-libs/canlock/canlock-3.2.2.ebuild
+++ b/net-libs/canlock/canlock-3.2.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="BSD MIT"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+legacy"
 
 BDEPEND="sys-devel/flex
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 4a3e91368209..e59c14288467 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -2,5 +2,5 @@ AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4
 DIST czmq-4.2.0.tar.gz 1522824 BLAKE2B 2b2ec308f37a122d5478f63ed029c5ac01d8da40e676e812ec321e039839c7d364fef3eef67df928e6514f0fd2cd65ae35ba89347ead2b44c610812a012364dd SHA512 a3716efbece193196355fb7055b7e81067d29551765de2533178804ca5d85f98cd8cd01f88b4eecbea905adf3b7513e3b8a7e78e350adf1a6e69edbea5f6260c
 DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f
 EBUILD czmq-4.2.0.ebuild 1167 BLAKE2B 6aeb3a671a4ec525a361ba558848cbe65bab7bc9e831f04a3eb3b2c4470207460f15385e304e2293ad260967ac5ef9fe39a2e943315ef3783fb17d82bfa4f4d8 SHA512 a31dd593f9d2537e71e16320eefcd6785f9338395cb51a30de30b3d9ffdfa41f143174934d0ec794f67f2b06d35ceb10151846dadecd2fdce8dc8a314bf4a99f
-EBUILD czmq-4.2.1.ebuild 1241 BLAKE2B 1c12101965f679c95c09b020c20d8a23076e76a685fea160c210b71a44bf3257aa97b5e9917db768f1739f2158e574b1626e230be08d0dd0d8e3d1028e245e05 SHA512 5692e9a199e75224436e632bb8c0ecbea0bd22a59c8112e3b0e36e86e3e74afcb589f6419ee9e7c53b6d669762250ad9a0bbebf621faf412505234cfd31dc6ad
+EBUILD czmq-4.2.1.ebuild 1237 BLAKE2B ecf891d5551b1b3ed34bee8a70e3068c1f57407b56b5083a24945305df8b49f06a481734159655393a2e0a7c51154eb2e7c8c935261d3bf7ed1872d60fef7587 SHA512 5460a8a6174d2a8ae9573488201aa8822bc73be4acd506df2eb9b4d744f272f4727a6b3789da2117a21f6081f664da41c5d798c45da926918a8b6afd47c957dd
 MISC metadata.xml 786 BLAKE2B 0b02a6b39b849b994c1c1e053b8156795804fcbfaefaaaa74895215f9f3394c131888a561798abafbf3a16f46bfbf00f1609ebeac3c1e5b63b1d25d6616eec09 SHA512 1dc7f022ee9fe463b647a750e13442254b6b9dbc144068401fd76ece667a1c570bca99e0558fb29738c6de68365d87584b7c4aa922e69c1ce47c903116c0fe10
diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild
index 4811dcd20d22..64690fe52ffc 100644
--- a/net-libs/czmq/czmq-4.2.1.ebuild
+++ b/net-libs/czmq/czmq-4.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa x86"
 IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid"
 
 BDEPEND="app-text/asciidoc
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 51817aed583a..f8238822b737 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -3,5 +3,5 @@ AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c06730
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile-1.17.tar.gz 69834 BLAKE2B a3c88174d96fb84dc1226102a1678aecec35945b89adb6e143f32674188ff7406f89b05f7219748bf0e9c6207ff3b28b5b800706ffc11b733c294e1e1c232784 SHA512 2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83
 EBUILD liblockfile-1.16.ebuild 1311 BLAKE2B 1495377f36328625a0407a76b1bc1a373f8ce3bbdae66600e3e00c6315d584bc29331794b568480c1118c3ce160dc80466a5a9e252dc05a00409c0283c6b41a0 SHA512 d4c32d400e2ec2bfcaec81b91e8bd50c61e546dadc33a69a193aaa5d4a258c8a8d05fe603f024a29ddb988932144ec14107b52c59c8b66fd33a8750a36674b08
-EBUILD liblockfile-1.17.ebuild 1335 BLAKE2B 1df86683ad133a548375b82ee6a54b98dcccc7b648b8ff065018a5f2e77bfbba18728b94493eec124ab1fc372c9eb46b25012d80ef09c8adb168ffbc945fd43e SHA512 54badd84594b6f5c9653aa85db15642aca6c5f5a7f3318b5b4b8bbce2baa9d36c392e0eeaa77621a1e81c04955f397953c4065a5a94323d7201c7372e5a01d6d
+EBUILD liblockfile-1.17.ebuild 1332 BLAKE2B 4f1c1eccfb3944a87d65554a0cd2fdf3793fab7069468eb0e24efc4a18bd6f588e243876a4c2d7ea9adc03d91fb91efce6a813225c041150c6382b63ab914a3c SHA512 f6090640af70631c12426435fe2240726ec3e23d2940da68fd2994cd6c86687b22f7e0626b291abf424cc70a76021f0271e3c8f38ffc83afeac46aa1820b271e
 MISC metadata.xml 252 BLAKE2B 41941b57b97ac20b47abd1c6d3ca599461c97bb2b06a4473605a273c68e7964d2365be48afbc54655f1dbaf896f3b91baafc2ea16c298d8f50b6849be2adca38 SHA512 16dfabb38698963e47a19156df2c54d7c01430e30fe7b51d80c94275016f39f3d8e7981473f4fd042f63f4730e567acd7e1e8ba08ce4386f3a35e3fc537aff7c
diff --git a/net-libs/liblockfile/liblockfile-1.17.ebuild b/net-libs/liblockfile/liblockfile-1.17.ebuild
index e7758dc0522c..8997e4f48472 100644
--- a/net-libs/liblockfile/liblockfile-1.17.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="acct-group/mail"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 55f63fa6eef3..1b35abe367c2 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,6 +2,6 @@ AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f23529
 AUX 2.34.1-opengl-without-X-fixes.patch 953 BLAKE2B 06d9e12a9ccb37950e87c89031d1067c8cea5c9cc4b0f802386d32c4ca8499537c95af799b9f9e9c57008e65c38716b01cf0dfd012900ae32a36d813311b48f3 SHA512 854dcaef25ad6927a288bdfbf842dcec385954abff1af710c9e789cdf4e194a271561b2bd8a695d051f675a3c2219563d834461f19ceee10e2320f6ac2bb5284
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
-EBUILD webkit-gtk-2.32.4.ebuild 9134 BLAKE2B 1493ae541df4cc7f7983f7ce82013a65b64b708e90580ab870d8ccd3033415b7faf6e6e327669e122b18a40eedddc80bd9876d836d32fa2613d7854f657001dd SHA512 66cd69e1ae0258bab69b0c94e00d6562144fb23906d536f019bcab027a26264042c418520371167094109d283c1adc0ecd976936ae9d096078f9784a6b0d5fdc
+EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
 EBUILD webkit-gtk-2.34.1-r1.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
index 2dd5eb64206c..50c1d19b401f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 4f04cc6cf273..a326879fe966 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index 5a0ab7fc5fed..1da63219985c 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -5,5 +5,5 @@ AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816a
 DIST automx2-2021.4.tar.gz 170903 BLAKE2B 9c8e9bc95eeac9a8a59430248d532d540e70a40c4d61f006d5d2649198e856e4b404ed75df745cfb06887c58049a9a233a597059e2f2971bf9f1c8ce65a34f3d SHA512 f306bfdca10dc884bef404e5ff24181dc9adfb8514fd0e0d984bac84ca4996f0978eda7161be46f1b3d93a9c0e61aaabdfb4b2886012570a51ad0aaf2286dd2c
 DIST automx2-2021.5.tar.gz 172317 BLAKE2B 501dea5561d780fed538676e41dac46da01bae24388f477afa66e1b27e8a271e48bd6bddc8f9a4e0f5e7b3eb9f58fca9a9b2adaf78de2f7cd2feacfc8f85c9a4 SHA512 00281f32df6b117690d9780b8a587907518e2485dc37450765c3f35acb92a27da73ecd4e35cd05e0a5307d179ba3edaa1dec80900a059c975589ae904456c565
 EBUILD automx2-2021.4.ebuild 1201 BLAKE2B 757048d7aae1e660219a7ad146e258d6d59138cc71d15ddf63395f305468e3c943e2c9818d3577efa957b163beffdab8f1d16fcfcb267bc53bc83cc6687f60c5 SHA512 2c91a5c291483e62bd7e1e9ce1e67f66aaab37491313cd1f56aff426d7340b280799cbb221df2266125cbdd21685e86724d663542822fe6b659206da46b401e2
-EBUILD automx2-2021.5.ebuild 1155 BLAKE2B 5b9dc245ea033a3d7d2d29c5e09c299dd8f95bcca7cdc8287c465ee15027c00066a7e0cc49e87dd45639bf2d929e748aeabc0cddb040d1583326bb4f21b7e661 SHA512 252be12596b4616b2476f7876f0b46f7e32d95b98e8265d5d9024bd922eb3d2a1eaace554e3a1d318aa3ef44f59dcf171bf4a90d942269d45665d5fed86d392b
+EBUILD automx2-2021.5.ebuild 1154 BLAKE2B 1e6275ca534940d430931f819afbf35473b5f476a26b9afd23325f8cc8839e341cc17f9678a639b8a8fa85af663cbbc51466b2b4dfcdb17e85c55d6411fa8a1b SHA512 32c929a2f4affa8695c4b1f4fa8758dc990f7c41547127f67cc9aac791ed9236508608e3520d64b4ff034a9fcc6c6ed62c17c66fa196334c40cd8281893e1456
 MISC metadata.xml 918 BLAKE2B 8f693feed959a0394e8be4a0f489c4913e142aaec8e71920fc0ace1e3ef1f8b5c79a312139bca612c3d204854f6e222252b25b1343539829f3950d1ae344483c SHA512 77e8f20c9af068189d12ba06ac566d03f8b86435b3c88682c6819975fc0636e4e427ab07b76db9d0e32a5b51b7861715c60209f6ee5ae0d4fb0a19a53c4b98a0
diff --git a/net-mail/automx2/automx2-2021.5.ebuild b/net-mail/automx2/automx2-2021.5.ebuild
index 053aba45a4d9..a7e9a55b9381 100644
--- a/net-mail/automx2/automx2-2021.5.ebuild
+++ b/net-mail/automx2/automx2-2021.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="acct-user/automx2"
 RDEPEND="
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 55646e479223..72fd66bd4411 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,6 +1,6 @@
 DIST isync-1.3.6.tar.gz 317174 BLAKE2B 3a230cd4bfac061ceb3325732c336ccd808a662989d2fc81459b4b27fce927a62e335200ef233f63d28b80f6ba79b1e5e102fda8ec68c9cd8e368f8ddd7188a0 SHA512 16e859361b27f00e1ef9eda0a2d06edf271b2643107a1f90c90713c34ffe9b542cdedb31218db72db633e12cf39a6aa2ac509333647c79a1825faac8ad4ead38
-DIST isync-1.4.2.tar.gz 336940 BLAKE2B d37dea100c5a994ce65812612a9571fe5649168560799ae17ec866774bb46b4ff989a87f4172a24006f0704e4387260716f4811f6e765df17719e598064119bd SHA512 4f95e06c5bf159b7bd8fedb75e72a8f08ee0907362dde068347706610ed251eb511b00281711ddd40a0ece31dbf07f07487cd4e5504f0898638870c51a506853
+DIST isync-1.4.4.tar.gz 340544 BLAKE2B fdf38b1066af10315b780897f1fe09c8f7d0b4d2202383a5f0ef24b98f11dff625bf178bbb0dc846460f661b18f923d2823bf79643d4d376b606b03980f22e18 SHA512 b769f474f2296764cabaae7e2b23e47c22714fca5919e9f1c916ed70b18c71c0bc9301fff0f64434f4f0ae28c9d16216e72556b48014ec94d1b7646de7183011
 EBUILD isync-1.3.6.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
-EBUILD isync-1.4.2.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
+EBUILD isync-1.4.4.ebuild 860 BLAKE2B 203e711e5bd80a97875a1fc9d796bad68dc9674cedcbf7afe4a6681f9810d275f98d4f7f0ebb41743b9a895f3aae44f2a6eedb36f86f496e59b81d06bb918921 SHA512 98324174022234f8a59f597300896bbaf308963f7981658bd1f7108e11914589d15a7bb0c40ce68c1a964c0d66cc66d795c9dd06f3165a3c79cee7fb3d0e0de0
 EBUILD isync-9999.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
 MISC metadata.xml 377 BLAKE2B bf6ebe92478a45a3e364cdbf971f339468b87cb07f5206aa0db1e00d03bd1bfb920f1df1be8547d8d668e474de38d29ff9902e0411b816e7c7b190ba66bcb90f SHA512 030ed2e882dcc1b89eb2ecc330964636e9dc6fee7c90e64a34ffc0046f0b11a2df51d74d5869ee4728f0b6d41abe016983ce16aed6928a6a917a88fc9d68a407
diff --git a/net-mail/isync/isync-1.4.2.ebuild b/net-mail/isync/isync-1.4.4.ebuild
similarity index 94%
rename from net-mail/isync/isync-1.4.2.ebuild
rename to net-mail/isync/isync-1.4.4.ebuild
index 07b35974fe65..210ee8d0b3a0 100644
--- a/net-mail/isync/isync-1.4.2.ebuild
+++ b/net-mail/isync/isync-1.4.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 IUSE="berkdb sasl ssl zlib"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 14f8b4ae254c..7424d61353b2 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 09dbb9bd4563..f8830c7e2471 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,8 +7,8 @@ DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d546460
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
 DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
 EBUILD networkmanager-1.32.10-r1.ebuild 11696 BLAKE2B 8cf1b21ce091f0d60b303b176ab801dfb292c3ff5da76e0988e7440c718d2a02786bd8b82828f8b9f70c21b4bfd4acecb87f9c32b56a6ba251f60512a855087f SHA512 4ba056421e940bf557f037a4357a31af2d3d577d1ba013350009ec1849146c6d0cb412180a60bc2ac7c9f712e0fd6c093f7e2cda45ce08823e0acc2bab0e0177
-EBUILD networkmanager-1.32.12-r1.ebuild 12243 BLAKE2B 13773159c5df4f8c1bd2b91fd261b42ce1bef6aa3e54ce7568727b6fdc83e612925908540ebf10765f379a2b708b892ea1e843db49f02eb83fbed0ae091b158f SHA512 8ab56159d2b8d9b4914abfc0784a4d2139ff7850593c260fa1c841a2446c94ebab453f111b7edbb692b1d9609ea67a4b707c1c091018af8d60a75e665e5497d2
-EBUILD networkmanager-1.32.12.ebuild 11972 BLAKE2B 3f6775c382e00633ce3dbe500b89bbf0617c6700356e19197e10f71642fdf974767c5c7b631e3cf37c7a20998e215de10d8f00f363f5c2865eeba840ea026874 SHA512 5817947a4ffe54d60fa241a18f3c1b9dd1b84b6b6b581c191ee3414b884dca41e907aaa35284ca10459133aa703547460935d7dc347163ea564ef80bd5c13f5e
+EBUILD networkmanager-1.32.12-r1.ebuild 12176 BLAKE2B 5b158ded9412830690fdc1a7b2546ea0e3dfcc01f7e663c0d0f7c89c9db7728b190cfe32abd6cbf3e2aa27d65329ce2e7c564592389996bdc9b11592cb0ea069 SHA512 2df198811228f9e191db18489722449fc0de3007017eec480d618d8ad371e85f1528811f2395b6f84574cb52c19b510d2f830f77ff16dcc1f8e174c9c6775c07
+EBUILD networkmanager-1.32.12.ebuild 11967 BLAKE2B b94f628f497e85d43f000598a74a88fea23f21dbda412abb24dffe2bb736aef7a3d0d587fecd1f706049ad2411610ed4790c8391fbd5caf391857e38e9ec56e8 SHA512 31de3c5f36e5033175ed9c1fa6d3687542237f04d17303528c73671627e85d801a65d3d2fdb0494cba6c2f041941a360ff799c8984558eb33860b544a4a80ac8
 EBUILD networkmanager-1.32.4-r1.ebuild 11371 BLAKE2B 5ad40b864ffd1ded48fd148267362ffaca2b1139332a1fd7e632909ef617b9549b4cf913be4dd43bdd8c862b6eb77a284aa75863c10bba4e0859bd3ee9dc8808 SHA512 e44332cfac5c3e9cd2931e5f5a40c3b219c0f55684c0bced16432ba40ebacf2dffe368a741f521014cbac4a16eb04d88c985fdbfd6c1f4c9da8f31ddfe919a9e
 EBUILD networkmanager-1.32.8-r1.ebuild 11384 BLAKE2B 8ba69b4605e75af3d6ae5cdded420ab18aba256b9ea4dee03885d068f0715e405c8fa6698a7c8bce9f6578293d37ca357829f801cebcef55cc3982c197b22648 SHA512 01ef6f7183dcf8d0876a725f729d8d064b492c295ec12345465fe74823d26a14dfd03a4f0331283dcd8d98c8606bc46ca2c8d1ab10385b5516ac1f02a8904667
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
index 7cd23f0708ce..005ce3efffb2 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
@@ -30,8 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-# Unkeyworded given somewhat experimental changes for bug #816210
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/networkmanager/networkmanager-1.32.12.ebuild b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
index 0a994d204465..b364bb3e0fb7 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 35e1ee05a356..85aabeb6ef54 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -7,6 +7,6 @@ DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.4.ebuild 1532 BLAKE2B 798d515cf02e7ae01ff39357151bb57d6a2d29594e6fdcfabefec77432f6ca94b73cf697850a83558c675bf83cde86bea452358fe574e1b64bb6d53b786c916c SHA512 92c581282a689a04bc8f7a9300d9565ebfa1a45b1ad18e114e7cc539055ab04bc962e92292aa1873d816d0ed470bb05c3d57c888d2b1cd923e0bf49357b9e4dc
 EBUILD socat-1.7.4.1.ebuild 1479 BLAKE2B fe50e1861da8d2e17344ae1df1e6433ea7ad694a7ee8a19953a6d35afacfda16bb34813391f35483224c71a93d214eb5bf928f8ab480df384d988e4c105c897a SHA512 9a7aade38d9239f319f1f2fe313ad4ed9ca9040bfedd14d1329294cada49b76aa924b66a4c792e31ed0e58f4431818bdcc42a6ef616d0c72ccdc08f49477af3f
-EBUILD socat-1.7.4.2.ebuild 1505 BLAKE2B 6bfddd967edd80854b0310c03fbddd6c04b18883eec1fb80df018d63ea32e09ce24522af4c02feb6f6b48f89f9ee29b94f32d902f8ee9135d0a769b74d81402e SHA512 716cff0455112b53c130e4d8f5806f2637a09889fe652c2d0a0b3321d60065a9a4ca7def74266bde6aa92d730810b01e4d21e2d1d5b1c3b4259e36f7efc2b095
+EBUILD socat-1.7.4.2.ebuild 1502 BLAKE2B 35babb2d5719c566afebb8717ed3fdc92b5c611cb097d46851471d2f2b91eb9c15fe90efe2fb2433b6a88f0ebf41ab36afdaefee581ae91f88572b86f4e382b3 SHA512 db8b77987c12436f8db4a89a6b8cfb8fa1c0e818e7d1f2de14bfab0ef0291cff2ae96e624f9d1deadc14fca56d1a1789c8d032abf45a18095eefd4922a4aa6d8
 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.7.4.2.ebuild b/net-misc/socat/socat-1.7.4.2.ebuild
index 840f9a0b768a..7bb1513b232e 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 9ba84e9e1268..afff426de228 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -8,6 +8,8 @@ AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
+DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.11.0-r4.ebuild 4203 BLAKE2B 6e0640b1a200348f3301485410bfb0c85928efa2729d40a76de2be27e5c7d14115fc775528dd0482dd8fb2d7e16eea4d30c6f5f6b5e09c11e655bea8791f76f8 SHA512 7f91cbac0fecc548d7067c54530de96939d081f7297478cad7f006e72648f2dab2156151250dfa5324fcae50226b1a51300c259564830f84e8dd67325db71748
 EBUILD tigervnc-1.9.0-r2.ebuild 4274 BLAKE2B 976aaba3766e4bbec266086c4e7d6b1e197a810bea4e2e0391d986162aeec60373a7358ec2d951f87aab83ecf6a0b4ba4fcc65a92ace997437e47b5fc015d75c SHA512 bc988f43bf23dde99a675f4510946731a5a896a32a043d08a755fd9a6dc94abc3c347abf496066edd2989bf150f5cd995cb2582354b63e885ed9e6d3fe98c5bf
+EBUILD tigervnc-9999.ebuild 4164 BLAKE2B c03ae1f585416150fc2a6c5463735e23233f373944e8c0f69b1599567008076594c345e84f3996de7216e48f67416d9cd2b23a639ee5aa8d6917d4df7334a826 SHA512 95bcbc3bf024436bb52e874023d50f455765f9b7b943d5352ce07298ca9bb2315adbf4064bccfc732479097edd7a6cd2b765ec04072872290c3cebaa3737107d
 MISC metadata.xml 471 BLAKE2B 450ab613da6c09763bd4d8ccd873b0c808617e5f9c4a95ecbba0bde24601ffc877db8b81a4290cb7574589329d654ea05eecf77195ac481c209000b7ec314773 SHA512 f6811c2155dc2079293bd335d9c6182a2ebe1853ff666f2c28dfba1141cf4d92e845ee8a99da9799aa08fd8f752e9d1d0fd0de8effac1fda9b19c8e464ee2435
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
new file mode 100644
index 000000000000..01ff15488f6e
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake flag-o-matic git-r3 systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( sys-libs/pam )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcvt
+	x11-libs/pixman
+	server? (
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+		dev-libs/openssl:0=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-libs/xtrans-1.3.3
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+src_unpack() {
+	git-r3_src_unpack
+	unpack xorg-server-${XSERVER_VERSION}.tar.xz
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+	fi
+	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=no
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+	else
+		local f
+		for f in x0vncserver vncconfig; do
+			rm "${ED}"/usr/bin/${f} || die
+			rm "${ED}"/usr/share/man/man1/${f}.1 || die
+		done
+		rm -r "${ED}"/usr/{sbin,libexec} || die
+		rm -r "${ED}"/usr/share/man/man8 || die
+	fi
+}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index ef53308918fb..577c04900f98 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -3,5 +3,5 @@ DIST yt-dlp-2021.11.10.1.tar.gz 2042241 BLAKE2B c4542edce26931a8753002a5cf0fda46
 DIST yt-dlp-2021.12.1.tar.gz 2064958 BLAKE2B d97bf6bc5d6a97aec05be73dcc00aac6b1aff011c307abcbf604a3bfab06dadfd28401eab8ad26d42b7ec3db778c66e9fa2de09d3e6c28304fd28791532509d9 SHA512 d04e9e5ae36e73923ac79bb98af6e402ba0b4403430cbcc0517e7f446d42b6c637846b11489c0159faf667ab798b937abb9597fb5fba76b6f7b6e2b379bae328
 EBUILD yt-dlp-2021.10.22.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
 EBUILD yt-dlp-2021.11.10.1-r1.ebuild 1773 BLAKE2B 7081587398e739d478451f9c0faf3e88fc73c7703e85568ffc6587454c78097f999fb62b52a8c7e6248cf930850ba94a0c97cd741697f6adcc926b18cbeda745 SHA512 bf5863ae2433774ccff6311ccbda227a52393178b65a37f765523829d9deccf8e8a3d0a676896b42a58702571d5fc23661b62b8673be4cfca3c7dd9e151b41cd
-EBUILD yt-dlp-2021.12.1.ebuild 1775 BLAKE2B d03e77ab2e76cb0849fb6c254666e5e5572dc3a90dec2826f51bb8d1ed31fb142a2d10fa7f67c20b66adefe0ae831ca52e79aa4bff0a4120981f6209a0c706e0 SHA512 0ef0ec553b54b55cbd5bfd68f9107f1bf58008ce745d3344d3cfcadcd131917d143b2315bee482eeb11adff73fe46010e232ce4248700cd264bd5c5bf4ce4e6e
+EBUILD yt-dlp-2021.12.1-r1.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.12.1-r1.ebuild
similarity index 85%
rename from net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild
rename to net-misc/yt-dlp/yt-dlp-2021.12.1-r1.ebuild
index 79ffad33d94f..f6633c012f81 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.12.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
@@ -20,6 +20,15 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri setup.py \
+		-e "s/'(pycryptodome)x'/'\1'/" \
+		-e "s/'(mutagen|websockets)',?//g" || die
+}
+
 python_test() {
 	epytest -m 'not download' -p no:markdown
 }
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 318c57658dd3..143a3fa3a28f 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index ebdb09abc1e5..a8bb9ded2b35 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -4,6 +4,6 @@ DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4e
 DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
 EBUILD retroshare-0.6.5-r2.ebuild 4114 BLAKE2B dbc08ddaf55fe725e61f03f85458d334b73e5d641a050d418b63b1b5368d6447b4cd3a6ca45f75a7d8cdffd089814adc62e24243507d72a9438ff2afff1f9784 SHA512 4dfb1b8cb8e941a593e806136823602974b1f9fd8a3fdfd4541ed4253404d9a679fb7f75bba5072e0f8302d75d57de5d3240d98145eaae59b026c04eec4b8e39
 EBUILD retroshare-0.6.5-r3.ebuild 3734 BLAKE2B f085af9005a35f126d45ad579cff0b907301ee6d3ed1280e4668c51a0db170e681cd2cc246d0306842c01e19dc1548407f38a4139c48498a28262bbabbb365df SHA512 cc3d8766f874e35365995ed5758d2711db05590ee76cf65f6ce2807ad4de611e45adec9c9fa486e60d55974fb3691c66f24b4889abcf0b059256968f5a3b39ad
-EBUILD retroshare-0.6.6-r1.ebuild 3525 BLAKE2B d7ebd23b5690ce5e67e01adeb7f5dd8606bab999a162dbf86a6dcde03b882806f9dc072c1e4e47c16a1ac298c11590245b1898edcc1b77a5b96ba8fe3113d292 SHA512 004647ff26344ea1602ae5dba0ecc8844ad12a93248e0d1ef5d2f0e0f41dc3d43b77bc7e37f4034e93d1566f9c8870404fefc1e25d676c6998a5d83222a8a7ec
+EBUILD retroshare-0.6.6-r1.ebuild 3524 BLAKE2B c0ea71cf99b08d2a733a862eff0edc6cade4c2b27c443fbd41857b5af81d605326e89f5b680cf9b29c6df4136f28791fb46c4a6beb217d10c48fc2ddf40b9960 SHA512 8795f427eea27d73e6b5f23d5e7ab2b127e760d95750d34d8e5a6c67ec9dcafb70312693e28e024ca0be04e970d3f8e9faddcd9a0430e3bd3f1607fac5663a7a
 EBUILD retroshare-0.6.6.ebuild 3481 BLAKE2B 4888c2ac8c7733dba086f0616d3a6e6421daeeadf2ed30c16043dc88a06fbb66e2812740c0ff3ddaa2f376858d2cef81580b6ea14245d4cafeb83d5a61ebd42e SHA512 50d1083dbd9fcd0e2333193473903b828e7b04341da6655bcefc8b249ab591f016731de2ef0ac61aa5e95b13532017d62505df2931ba31453a43657f8e9d05ad
 MISC metadata.xml 1936 BLAKE2B 09abd24c20a06e479e8212558b70a8c08b737df830d68242f07e88fb1f070de620eeb8bf0a047317f9661b8af9d213720041f25dd06f8f01ac6454eca3f4bb9b SHA512 f4365576e75eb0de36b4c1bff1e73fd87f8cbb1d0d6ecf6ae64081d9cca3c534c7ba577b1209aac287699f25d852cca8e316a4ed0f91b852527f27f9b0b80b57
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index 1fedc3f34d4b..a57d5b582fd4 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/RetroShare"
 
 LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
 
 REQUIRED_USE="
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 88542b4abc2d..0680517f8a6a 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 6a31cc9b46b9..a74440f849f7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,21 +1,19 @@
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790 SHA512 2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155
+DIST haproxy-2.0.26.tar.gz 2713209 BLAKE2B 9d33cc57d9b1761844fda05981ccddc4de6823a0c101b6fadf8ce2dbd0b1a76f2b4c2b6d5f9b656eabfc40af2dc750b81b922149583669f3e7001ba60525f488 SHA512 eae97096a66038fe8d5bd86b6a15ae679142593d3cb27ec0fd495fc16b926e58c9a25a6c050a310c450c7c167ac20fad46c60f31fe58dc1a1da11d987e8eed17
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67 SHA512 174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.18.tar.gz 2940789 BLAKE2B e932c53b67052a2696a00cc9e0ee79ca2c7bdc5ba51bbb6c5bf3e7d5ef8bcf3c4e0f6524d40bcbc3342f86c3ddec6e27a0a2ad329ee5ad510260dc2f24b3913b SHA512 255b5d5984578a8d018b80e213ff2bca583de30d835aa3de345fabb05c229277d18007251b441dfdbf863e0297a2fa6e08e41b7b57dd76eba7f2e50879ae2cfa
 DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8 SHA512 a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
-DIST haproxy-2.4.7.tar.gz 3594183 BLAKE2B 170697fd7bcb886033d4dba5a9f7b7289cb651b82f3959354e393553fdac8fe8470cfacbece46f801a0e3f35d418d304f189e1f14c7142047ffb81f37c38251f SHA512 7ad8e9bd506d6f5919ff9ea97b08a4ec283bf580baefc7945632ea5a88a73081bb3d82586855efc7b7b9194558f12823c26b7a7498ac08c3efc158ea6583ec9f
-DIST haproxy-2.4.8.tar.gz 3599555 BLAKE2B 6b5a6460be73c643ab9606f65e5ba35250233845ae8cd2decbc19df05ef28c2868d8f331e8a18d96555f292ceee179abd5ae99da11c1c4d98a503b1b9b2c16d3 SHA512 8e1d28191a8c26d46989359a213444f30a09e439d32b5ab6cb01a3ca267788fc7677dd14deaa43a7f6c7741cbf6c8fcf6cdd5cf927d23e48f82b9e7723d8a6f9
 DIST haproxy-2.4.9.tar.gz 3604655 BLAKE2B d5703dafba5858a026ac8de98e81041f95d9c19c97e540c4a5707a47accbf79f43b64b64a794d5edab04530006a244a9073c9eb8e73a3bcf2c8b89f0fff5e771 SHA512 52ee14898ee92b0c13b1788e1178251c00d7ddaffaf862b8ad9400261674420db4b4d4611565ae1508d288fc6f03b1fd4d0207570793ad53a615113f9774cd3d
 DIST haproxy-2.5.0.tar.gz 3803196 BLAKE2B 271661f685f4aa885e3cab75c4a0abeb9751a7cb4ceec3a71f475e75b635f8452857dcaa7b010c8d0621becb3ff7f5d49af8d7d758b30829ae99e153ebc85b56 SHA512 70068962a434e9ba4b2d7595b929aec618ee62d51935c9836f2617e639416e50077495bbf08dabbe7dd49f2d4e3942e55a96a5de33a7846377972fbc3eedc1d0
 EBUILD haproxy-2.0.25.ebuild 5486 BLAKE2B 2ecd95883ad3d19c067d07493bf9cfa254fed562798002d8640d9ca754f2f4c415b58aed405547107332ff9ca8404e2e95319735874e455a98087d8d236c5500 SHA512 4d77e92faebc06ecf562e52a02cf1b11b1ca77bef89347680372d4f9cadf1fd6e7c2f737582232630f981adb43be40ab222543794f82c11d656550953da4eb08
+EBUILD haproxy-2.0.26.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.0.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.2.17.ebuild 5486 BLAKE2B 2ecd95883ad3d19c067d07493bf9cfa254fed562798002d8640d9ca754f2f4c415b58aed405547107332ff9ca8404e2e95319735874e455a98087d8d236c5500 SHA512 4d77e92faebc06ecf562e52a02cf1b11b1ca77bef89347680372d4f9cadf1fd6e7c2f737582232630f981adb43be40ab222543794f82c11d656550953da4eb08
 EBUILD haproxy-2.2.18.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.2.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.4.4.ebuild 5705 BLAKE2B 9fbf9a8c3104e5fc2562d80a821fcc23e2d092eebce50f4ff91740affe4a5a03ab51c737f32e491aa1c807b7c81c85b19c03981bc56ca21d6de6b74246a50d29 SHA512 993f85aa9f17a9d268eb41e54afd92f8425ebc200c3734e128ff32984904ce1e93bf640a2848f80a4fca847583d2b3d9ee5f6091dc8f9ea25c8f4ac8d1a41503
-EBUILD haproxy-2.4.7.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
-EBUILD haproxy-2.4.8.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 EBUILD haproxy-2.4.9.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 EBUILD haproxy-2.4.9999.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 EBUILD haproxy-2.5.0.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
diff --git a/net-proxy/haproxy/haproxy-2.4.7.ebuild b/net-proxy/haproxy/haproxy-2.0.26.ebuild
similarity index 65%
rename from net-proxy/haproxy/haproxy-2.4.7.ebuild
rename to net-proxy/haproxy/haproxy-2.0.26.ebuild
index 5c4cee22742d..894bf001b81c 100644
--- a/net-proxy/haproxy/haproxy-2.4.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.26.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 else
 	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
 	EGIT_BRANCH=master
@@ -22,8 +22,8 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
@@ -45,6 +45,7 @@ DEPEND="
 	ssl? (
 		dev-libs/openssl:0=
 	)
+	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	lua? ( ${LUA_DEPS} )
@@ -56,7 +57,11 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -94,28 +99,28 @@ src_compile() {
 	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
 	args+=( $(haproxy_use wurfl WURFL) )
 	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
 
 	# Bug #668002
 	if use ppc || use arm || use hppa; then
 		TARGET_LDFLAGS=-latomic
 	fi
 
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-			fi
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
 		done
 	fi
 }
@@ -129,7 +134,7 @@ src_install() {
 
 	doman doc/haproxy.1
 
-	systemd_dounit admin/systemd/haproxy.service
+	systemd_dounit contrib/systemd/haproxy.service
 
 	einstalldocs
 
@@ -145,14 +150,13 @@ src_install() {
 	fi
 
 	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
 	fi
 
 	if use examples ; then
@@ -163,7 +167,7 @@ src_install() {
 
 	if use vim-syntax ; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
+		doins contrib/syntax-highlight/haproxy.vim
 	fi
 }
 
diff --git a/net-proxy/haproxy/haproxy-2.4.8.ebuild b/net-proxy/haproxy/haproxy-2.4.8.ebuild
deleted file mode 100644
index 5c4cee22742d..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	lua? ( ${LUA_REQUIRED_USE} )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre2:=
-		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}"	TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ERROT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 0b2f3135150c..a6aa5fa02222 100644
Binary files a/perl-core/Manifest.gz and b/perl-core/Manifest.gz differ
diff --git a/perl-core/Module-Metadata/Manifest b/perl-core/Module-Metadata/Manifest
deleted file mode 100644
index dae4ae3d5301..000000000000
--- a/perl-core/Module-Metadata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Module-Metadata-1.000026.tar.gz 41296 BLAKE2B fb3ad17b0617fecf655635653ad0a7a8b41340499059ceef9b7eb027d6e69555b1147b06929f8192bd8a187b95389478a5f9ca4c114d74ee89b81d538a84f478 SHA512 27cbebefc8e76bd8573215f567e6d57e6d8c0f09244867b8a5baf85142e325bddd645d03c5318ebed738dfd60a552491a1bbef6bf9f2d434aa99306c1431ad88
-EBUILD Module-Metadata-1.0.26.ebuild 367 BLAKE2B 255e5f77997f938f5da60aded6b1f7b0c729256abae0954ffdc4e5cdf1d928a81dd5740a06d7707293a756e299b3c7e0bc5aae5ea7e674bc01ddf8883bee2d4c SHA512 d866a89979360cc8e5b50507df9e480121c9aee189b4b052f1c415aace441bf2b68fefb819f547b1e4eaabac5612730cf895f0f7f5779133454073f1f4658e8d
-MISC metadata.xml 403 BLAKE2B 5c333e044751815d53c1f16f2a707276b4e9689b61a3a61a960e28876ccb294878d226b81a28a660a3006ae9ec78015d1cb2e69e7124c7e6344c0693989979f4 SHA512 b83262b4ccf7a83ac79e157bf8ebbc77d0d6073d503546bd918b9b177bf785c797a92d203f890e4a4dce6ff4fe6b220b87fd4fc9acb5407f2c73ebe5e6910858
diff --git a/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild b/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
deleted file mode 100644
index 2bff9278922b..000000000000
--- a/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=1.000026
-inherit perl-module
-
-DESCRIPTION="Gather package and POD information from perl module files"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=virtual/perl-version-0.870"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do parallel"
diff --git a/perl-core/Module-Metadata/metadata.xml b/perl-core/Module-Metadata/metadata.xml
deleted file mode 100644
index fd37ab869ffb..000000000000
--- a/perl-core/Module-Metadata/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Module-Metadata</remote-id>
-    <remote-id type="cpan-module">Module::Metadata</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/Pod-Simple/Manifest b/perl-core/Pod-Simple/Manifest
deleted file mode 100644
index 0d4ae3181659..000000000000
--- a/perl-core/Pod-Simple/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Pod-Simple-3.28.tar.gz 244687 BLAKE2B cd32ff120bb0b06e5e636e4a5bd1f9686dc60d2304405e2fcf1e008dcb623cf3c4d686e7cd45b32aee3aae0485b42242b4de09c1c5873eff0c5fefd9836413f3 SHA512 3b10d389491662242ecabbb53a4c979cdc70a469fe7f4bc184f964590d0f39ec955d86cc979dd17e9aa3024cf3f7d59a132daf88df04baec0546c13287848f09
-EBUILD Pod-Simple-3.280.0.ebuild 333 BLAKE2B 45abaa0feb6cd9fcf03ef7991b4e4622321c3bee44182ead6cf40aa3b66f3b09c3fc93e5741a6ac3c5e93be726e66caa7123b5228f413c5aa187c5ee2ede1122 SHA512 3b0da85fd6e51638d381e01af1afa145bed1e7d442e29d5e6473c91bfac5a85e2d1ec1b6f5447d7153fb450df08be1fcb5f72ac53fd6d25c3fc01a4e3ef16177
-MISC metadata.xml 2279 BLAKE2B 325cdb89dc4b1f57cc1352cafb13e1204521e2d9cfbba24e470314e2b7ef1774ad6467c1d3350c45f0802d4e4db52f810f0a3e3e209f841db4a7d0028385e383 SHA512 8842ca71cbe8f41b8a8d5f56e40df3f82d58a797a18fc109d75f36f31f1ed8d7dba47ad46240f153223781864c6bbb42ff5eca37b226710ad8b450facb29ff27
diff --git a/perl-core/Pod-Simple/Pod-Simple-3.280.0.ebuild b/perl-core/Pod-Simple/Pod-Simple-3.280.0.ebuild
deleted file mode 100644
index 052975378921..000000000000
--- a/perl-core/Pod-Simple/Pod-Simple-3.280.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DWHEELER
-MODULE_VERSION=3.28
-inherit perl-module
-
-DESCRIPTION="Framework for parsing Pod"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=">=virtual/perl-Pod-Escapes-1.04"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="parallel"
diff --git a/perl-core/Pod-Simple/metadata.xml b/perl-core/Pod-Simple/metadata.xml
deleted file mode 100644
index 497d99586da1..000000000000
--- a/perl-core/Pod-Simple/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Pod-Simple</remote-id>
-    <remote-id type="cpan-module">Pod::Simple</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::BlackBox</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Checker</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Debug</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::DumpAsText</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::DumpAsXML</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::HTML</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::HTMLBatch</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::HTMLLegacy</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::LinkSection</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Methody</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Progress</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::PullParser</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::PullParserEndToken</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::PullParserStartToken</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::PullParserTextToken</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::PullParserToken</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::RTF</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Search</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::SimpleTree</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Text</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::TextContent</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::TiedOutFH</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::Transcode</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::TranscodeDumb</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::TranscodeSmart</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::XHTML</remote-id>
-    <remote-id type="cpan-module">Pod::Simple::XMLOutStream</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/Sys-Syslog/Manifest b/perl-core/Sys-Syslog/Manifest
deleted file mode 100644
index d3e2d02e241d..000000000000
--- a/perl-core/Sys-Syslog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Sys-Syslog-0.33.tar.gz 82440 BLAKE2B f9c51f4a37b50741ba18ecf91fb7fd2775490b1961cd81e665c82ee3f4565231f486049347e406f39ee8de3c07d6caed406d2154394310ec466853f808785801 SHA512 5903d63b99915947c15326ca51c2757c8fb84202aee449df3bac699e95f7d85549e30cb0e512a6fa30163c0a182bad0e9944aed341efd4a261ead169fd5eb9a7
-EBUILD Sys-Syslog-0.330.0-r1.ebuild 340 BLAKE2B f9ef6bfce8cdaf9fb2f08388115586f05aada1287bc67792c07024fb2f3b1ea95d9d7dfc6a306538f7f47285ce6a41aa3d37b867ed8796c279a6c6963616d965 SHA512 8e91a474a5136cd3b8ed7586a4555cb3625cbd3fde2125a63f59ca4392892191837c21e7f8977371dc3c141ac20b22ec193b38b9b9298af4af8d5bb185f881ca
-MISC metadata.xml 733 BLAKE2B 314f3804992deeabf11dcfbd15e1966551b91de165b26f9f4ae6ec8cf8ae98c6f00fb40726b28beb0a3ce80c3ee2c84a8bed29f53cc3edfe2ad71e4aada21d97 SHA512 e76131e3cea7a9c7d86c10655fce3efc2dffb66a1b1ceeca3be407fe611c844a08d982b5772e28ddc5be5a45ba1df636e3b79cea9bf4df906f4d1c0bde6c7c84
diff --git a/perl-core/Sys-Syslog/Sys-Syslog-0.330.0-r1.ebuild b/perl-core/Sys-Syslog/Sys-Syslog-0.330.0-r1.ebuild
deleted file mode 100644
index 3ac1a4c4b113..000000000000
--- a/perl-core/Sys-Syslog/Sys-Syslog-0.330.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SAPER
-MODULE_VERSION=0.33
-inherit perl-module
-
-DESCRIPTION="Provides same functionality as BSD syslog"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-# Tests disabled - they attempt to verify on the live system
-#SRC_TEST="do"
diff --git a/perl-core/Sys-Syslog/metadata.xml b/perl-core/Sys-Syslog/metadata.xml
deleted file mode 100644
index 074a3c7149e5..000000000000
--- a/perl-core/Sys-Syslog/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <longdescription>This core perl package is being provided as an ebuild to
-  address recent security issues with Sys::Syslog. Perl 5.8.8 and above should
-  have 0.13 or greater bundled with them, but users of less than 5.8.8 may
-  benefit from the ebuild.</longdescription>
-  <upstream>
-    <remote-id type="cpan">Sys-Syslog</remote-id>
-    <remote-id type="cpan-module">Sys::Syslog</remote-id>
-    <remote-id type="cpan-module">Sys::Syslog::Win32</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/Term-ANSIColor/Manifest b/perl-core/Term-ANSIColor/Manifest
deleted file mode 100644
index 8569e7a56534..000000000000
--- a/perl-core/Term-ANSIColor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Term-ANSIColor-4.02.tar.gz 40250 BLAKE2B 9a9f42b0463f04caa1e99d9f998aaaa6754c4494582f96467f082001c09fc8f807af97101c48b0b2856f451b230215a0143237fc0917da6c79e1e390db611484 SHA512 46e5237b1db1a9d8c74e1039849e4cd0c3b9c5a1c860f00473f6690c632de9c8e4afb7e390a6da537afbd7780cdd3cc04a00c6a38d5b033bdceb88c9d5312353
-EBUILD Term-ANSIColor-4.20.0.ebuild 282 BLAKE2B 969be13237a778c23a70b62d5328294d606cc88ab50bbb62cb9b7484e6760f028ebf2cb98729d499f57dde2f00ca40d7d1bf78668315fe30321a699d7d791ab2 SHA512 a71fd03fbcaf44f0e397295054d1921b82d1f25184d04ad1ec1331ab741533689451eb7297e2238eb7f1d28c8beac546c4362f9fdcbbb9dcff676bd8dbb7374b
-MISC metadata.xml 401 BLAKE2B 252a2538ef386fb5e1c5055bf411a30eaa3be15d90b0be42502b78b4185d9a1271a770c2b45bb249c1b2cca97dd2a46b35d9baa09f358c0bbaadb482dde8e3c6 SHA512 6acf869ba376e2bcae6a6ce2ef4708d6ea1e93df76dcd656642a03d484cb1c3b82e632da00ecf2dcf7208d53bea3374287b921584de3711cc9ca06e1da7b3a8a
diff --git a/perl-core/Term-ANSIColor/Term-ANSIColor-4.20.0.ebuild b/perl-core/Term-ANSIColor/Term-ANSIColor-4.20.0.ebuild
deleted file mode 100644
index 3d69dc1d40cf..000000000000
--- a/perl-core/Term-ANSIColor/Term-ANSIColor-4.20.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RRA
-MODULE_VERSION=4.02
-inherit perl-module
-
-DESCRIPTION="Color screen output using ANSI escape sequences"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/Term-ANSIColor/metadata.xml b/perl-core/Term-ANSIColor/metadata.xml
deleted file mode 100644
index baabe187b35f..000000000000
--- a/perl-core/Term-ANSIColor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Term-ANSIColor</remote-id>
-    <remote-id type="cpan-module">Term::ANSIColor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/parent/Manifest b/perl-core/parent/Manifest
deleted file mode 100644
index ce7042dbd4e9..000000000000
--- a/perl-core/parent/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST parent-0.228.tar.gz 6130 BLAKE2B 3dd66186f2e92381ce38e924dc69ba80a6c531a8bbb6a96820bfd044d38272279f448d3da57f190fc4272947d07db34af7ff5449c86c3aec8f829382cfb78ba4 SHA512 52bbdf54e5d12ded9ec66ff894431d7864a9b2f34487a2a5d07611d37223f8edd5a2b2931f8b5ff8cdbc1b6d9ba6c22419d5cc86f6677d2a15c44223df47d50c
-EBUILD parent-0.228-r1.ebuild 300 BLAKE2B 17902dc766e768d9cc5dee8696c313659b83952c0c2a8f6ca84bf8a0805e90ebd90f45fbf64e1a27754f5fea4f7dffdd315922eedbbcd089a3c6b06e0e1211f5 SHA512 39a254f5b610f339d5b60981a5ae450398a979ce972e161ce90a25eab290fc5db2aa840b1a1e2be8bf315ab0eb69fe7947e5486a3fde169ada07ad62a98e3f88
-MISC metadata.xml 384 BLAKE2B 5675b4bc45a3a0145380f510e10c57392847f50e62397b743a4007403b1e1074724003e8f3726aeae4157aa2b2e6ed487a88f83ef9a54dcb1b985f5998dbae2f SHA512 fb55d99e74149a225266f02959bdb300faa16b3ab0c9950be23a45d2bb8f3048931fab6691a459206e7f37dab286490d246744255efa3cc83faa0446c57e28bf
diff --git a/perl-core/parent/metadata.xml b/perl-core/parent/metadata.xml
deleted file mode 100644
index 3107f3bb0ff1..000000000000
--- a/perl-core/parent/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">parent</remote-id>
-    <remote-id type="cpan-module">parent</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/parent/parent-0.228-r1.ebuild b/perl-core/parent/parent-0.228-r1.ebuild
deleted file mode 100644
index 6623538de1a0..000000000000
--- a/perl-core/parent/parent-0.228-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CORION
-MODULE_VERSION=0.228
-inherit perl-module
-
-DESCRIPTION="Establish an ISA relationship with base classes at compile time"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-SRC_TEST=do
diff --git a/perl-core/podlators/Manifest b/perl-core/podlators/Manifest
deleted file mode 100644
index 843909718917..000000000000
--- a/perl-core/podlators/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST podlators-2.5.3.tar.gz 104823 BLAKE2B 6f97b415b2b2d2f568a45e185d821c5849fc10a39ed4344213d8f2862ee6cc26c613e8a6a6970d5ffe12d99fd2663803cfd7112c95eb21e403cfd75e9cd1f5cf SHA512 e1a3cdd7f5ff9e3a174038ee3efce4900d7f591548a43aac85a76a884c4ca7925cd416b2d48de22f430763c3f04361052fd9c67f2c2667865fdd106ac7104ec5
-EBUILD podlators-2.5.3.ebuild 373 BLAKE2B fd199fdc8235fa487226cab57d4d643069a429c8b3a9bdcb891901e31fe3730c96546d3de12141ea5138dbba2db290147038c3060f3ad582df6d5513ac362b72 SHA512 8461cf338bbbc88810c15746c26aa51105fad3209f7db1ec500eb7bf77bac66042e2690171fc6866d18c4f1274df4cfe59c7f6bf936f48d2c3b1dc694f15666c
-MISC metadata.xml 702 BLAKE2B b620239b2f73ec76e5e58fbf57e0869f6902d0b699eeefdf8f55cfcb94491b31c3ead0e3a4255e05a931be7911554c75f32c72a873cc8d1d29d8b07f0e745700 SHA512 a1bfd18eabe41df0e4df99393900bcfbe5928b23614874d28b617735117d8e8d293d002e7da09ea44e9d4f029c8ae446c2f9566081725656d5dc1b3606997368
diff --git a/perl-core/podlators/metadata.xml b/perl-core/podlators/metadata.xml
deleted file mode 100644
index 5847751d4f46..000000000000
--- a/perl-core/podlators/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">podlators</remote-id>
-    <remote-id type="cpan-module">Pod::Man</remote-id>
-    <remote-id type="cpan-module">Pod::ParseLink</remote-id>
-    <remote-id type="cpan-module">Pod::Text</remote-id>
-    <remote-id type="cpan-module">Pod::Text::Color</remote-id>
-    <remote-id type="cpan-module">Pod::Text::Overstrike</remote-id>
-    <remote-id type="cpan-module">Pod::Text::Termcap</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/perl-core/podlators/podlators-2.5.3.ebuild b/perl-core/podlators/podlators-2.5.3.ebuild
deleted file mode 100644
index eedd3d0ba469..000000000000
--- a/perl-core/podlators/podlators-2.5.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RRA
-MODULE_VERSION=2.5.3
-inherit perl-module
-
-DESCRIPTION="Format POD source into various output formats"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8-r8
-	>=virtual/perl-Pod-Simple-3.06"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=parallel
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e1c177a666b3..3d1f0d89b2c6 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b026e63bec52..cd76470f9b77 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Thomas Deutschmann <whissi@gentoo.org> (2021-12-03)
+# Requires newer media-libs/dav1d which isn't available yet,
+# see https://bugzilla.mozilla.org/1734058
+>=www-client/firefox-95.0 system-av1
+
 # Wolfgang E. Sanyer <ezzieyguywuf@gmail.com> (2021-12-01)
 # Requires pandoc, which is unstable due to various haskell dependencies
 # (including ghc)
diff --git a/profiles/package.mask b/profiles/package.mask
index d3d1211267d8..4b185cbfd41a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (2021-12-07)
+# Fails to build with recent kernel headers (bug #801688).
+# Upstream is gone for a long time. Masked for removal in 30 days.
+# Users should switch over to net-dns/dnsmasq which provides similar features.
+net-dns/pdnsd
+
+# David Seifert <soap@gentoo.org> (2021-12-06)
+# Ancient release, EAPI 5, downloads random data,
+# latest version uses Gradle.
+# Bug #572142, #580176, #776298, removal in 30 days.
+sci-biology/picard
+
 # Conrad Kostecki <conikost@gentoo.org> (2021-12-04)
 # Masking newer versions for both packages,
 # as they cannot be compiled due upstream change.
@@ -615,52 +627,6 @@ net-misc/ssh-chain
 # Removal on 2021-12-08.  Bug #822435.
 dev-python/llvmlite
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-11-07)
-# No maintainer, not compatible with llvm-11 or higher.
-# Removal on 2021-12-07. Bug #812566.
-dev-libs/vc-intrinsics
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-11-07)
-# Fails to build with glibc-2.34, dead upstream.
-# Only revdep (media-video/clive) is outdated
-# and uses EAPI 5.
-# Removal on 2021-12-07. Bug #807172.
-media-libs/quvi
-media-video/clive
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-11-07)
-# Unresolved security vulnerability, still uses EAPI 5.
-# Removal on 2021-12-07. Bug #811168.
-app-misc/rundeck-bin
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-11-07)
-# Dead upstream, uses EAPI 5, no revdeps.
-# Replaced by dev-db/mytop.
-# Removal on 2021-12-07. Bug #819675.
-dev-db/mtop
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-06)
-# Libraries with no other consumers. Removal in 30 days.
-dev-java/mina-core
-dev-java/jnr-unixsocket
-dev-java/jnr-enxio
-
-# Jakov Smolić <jsmolic@gentoo.org> (2021-11-06)
-# Dead upstream, multiple open bugs, no maintainer,
-# uses EAPI 5, no revdeps.
-# Removal on 2021-12-06. Bug #819750.
-app-pda/gnupod
-
-# Andreas K. Huettel <dilfridge@gentoo.org> (2021-11-04)
-# Unused and outdated packages; the version in core Perl is
-# newer. Removal in 30 days.
-perl-core/Module-Metadata
-perl-core/parent
-perl-core/podlators
-perl-core/Pod-Simple
-perl-core/Sys-Syslog
-perl-core/Term-ANSIColor
-
 # Sam James <sam@gentoo.org> (2021-11-03)
 # Known issues with YAMA (kernel.yama.ptrace_scope=1) which is on by default
 # in at least the sys-kernel/gento-kernel kernel config.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 779feb626341..ec771f37d26b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4320,7 +4320,6 @@ media-libs/portmidi:test-programs - Install various example programs
 media-libs/qtav:gui - Build a video player gui
 media-libs/quarter:designer - Install plugin for dev-qt/designer
 media-libs/quarter:qthelp - Build API documentation in QtHelp format
-media-libs/quvi:json - Enable support for JSON output
 media-libs/raptor:json - Enable support for JSON parsing
 media-libs/raspberrypi-userland-bin:hardfp - Use armv6 hardfp ABI
 media-libs/rubberband:jni - Enables building of Java Native Interface library
@@ -4913,9 +4912,6 @@ media-video/aravis:packet-socket - Enable packet socket support.
 media-video/aravis:viewer - Build the GTK+-based video viewer.
 media-video/avidemux:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
 media-video/chaplin:transcode - Enable DVD ripping and transcoding
-media-video/clive:clipboard - Support reading from X clipboard
-media-video/clive:pager - Support pager!?
-media-video/clive:password - Support password controlled sites
 media-video/droidcam:gtk - Build the dev-cpp/gtkmm:3.0 client.
 media-video/dv2sub:kino - install kino plugin
 media-video/dvdrip:fping - Enables fping support for cluster rendering
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 836d21ce0e59..82e7e6d18ab6 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3213fdf1e8bf..a29f65633aaf 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -3,6 +3,6 @@ AUX grass-7.8.5-bool.patch 4472 BLAKE2B b48a2138b9299e91eb15ebe62f29f0a677dfc690
 DIST grass-7.8.5.tar.gz 61801712 BLAKE2B d7a929e28ea050285f47dd84093c6db85e00aeab6c397fbb63ac0e6ccac391d2dcad0d3fad18924ecae74b57638b7e3ccf1c8ef4a3a44e63b32f5651bf3f6c71 SHA512 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
 EBUILD grass-7.8.5.ebuild 6993 BLAKE2B a772460a6bc1ce8c2b50bd68dafb4b98c0771bab4ed72e99f685064081f7f9e1edb3abfc9fb308579e864f12beb282383029e89455ab73e4c235ebdc5ec81117 SHA512 cf69543c0883fe7d93bedb72280d04ca8055c6659bc84a6016a86c58c273487aba68948c84b6bc5ff3c84223c375d5ac4c32f7ca53dd175c2e19ded5c2a223b6
-EBUILD grass-7.8.6.ebuild 7051 BLAKE2B 6ec47fc0cd471ceafcfb36a20ec8838d404ee4afc4e4bd6ae128e75f1b0da1664904f66d444d98a8ffd5cc3f56c156bb85f31366ccc6ede3c5d17fbd0f7b22f0 SHA512 45ec6d127211da1f4759a3b27569da68c49c6c26b41e43a9ecd585ca06078cfd163e2a1b13a8e6b2dd6e503209281462e22f7792a9dbeae6de3bc27ad05420c3
+EBUILD grass-7.8.6.ebuild 7050 BLAKE2B 9ae4327bcdb97fe35ecfdf8868751f1ab292b85afdbd4f5fe762258473242ce437469186da6be180174503435791f53eade7f729f70ee0ab08177a43424f2da9 SHA512 eb147d33c9fb4da07748fc6af411d1e0feab989ba0c16b9241c756f9d949da6e93014612208da7232314c9a03acea2246af1c711eba972a8e3a14d418fd2d384
 EBUILD grass-9999.ebuild 6892 BLAKE2B 1396540d588329e56f3b9eef76efcdcae283aad5904bf633d8931312fba180c6d498fb967fc4a9f4b459f269fbbaa11ddb166f4ad55a24fc522817c8cde68ff1 SHA512 cf7162d2b39b396d4b701ba0bfd13a01003a98f857756dc62bd55ee5ecea472603f36e7589c2989f0ee066bb644402df74e4303b1e90311f5ce09f045f04497d
 MISC metadata.xml 1165 BLAKE2B 5cfa38c94f3855681ac0f61ae88c58de766eab048601d8c45324f192de975287088ab424030857f4a84ae6eea01fc0e9033ab36c00e679645545cd857722d060 SHA512 58a86942daa71543093c95015366a08f75fa88075330ffda2431e47d93d79f60c8f60b90c05e2a068283045f54db8f8f45dcb36664268a1207e90fa90bd6d63b
diff --git a/sci-geosciences/grass/grass-7.8.6.ebuild b/sci-geosciences/grass/grass-7.8.6.ebuild
index 3cb671b723e1..6f851f4ee8b5 100644
--- a/sci-geosciences/grass/grass-7.8.6.ebuild
+++ b/sci-geosciences/grass/grass-7.8.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/7.8.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index ca6a9eae3c52..bdf62bd36a60 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -3,6 +3,6 @@ DIST qmapshack-1.15.2.tar.gz 46899954 BLAKE2B b7121331039d8fedf6c44ef591e5f7a637
 DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4
 DIST qmapshack-1.16.1.tar.gz 54433326 BLAKE2B 58d3fff752187418552cba1d89b3ebd0082af379204b3c0b79cb8f8096cd422d3a9d347f7b91379868b37092469c5ef6187e67bfb7d0c3c07e18a65df0b488f1 SHA512 cd6c1818c2468a4654222d165bfa7278dea01890d4065a359942ce16ee1c643b54f86a94a30632bc414a1ec22e04ea340109fc89ca6c340eb717f8e86468e281
 EBUILD qmapshack-1.15.2-r2.ebuild 1282 BLAKE2B c149bdc91387d706c25c341088ac5663a7a536247a9d7662c2b29b5a621e4bfe3fa331ee045b7397a6c45a66a72f4a02225fd91c5d07eb05fb7f4d2265c2d293 SHA512 b4161a42a97ae5c6c285d4c381462753cd17cd79fe6b72e023a871405531de4964a9c1aedf985d08839f4637b61720bbb88c148881c3056318c434904a170ba3
-EBUILD qmapshack-1.16.0.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6
+EBUILD qmapshack-1.16.0.ebuild 968 BLAKE2B e3c07bdf38632152c967b9b05d3cc85f5dc03e9ecfb8995d6395cbb4dc30d3c26eed889b592cdbff622733e49374aabb0073359be6e7d3fd0091c209a95d667a SHA512 23999194f7c16d311788d88381f1ce886c00c93f411beefa109e937136e5210eae3c5fe6185656d7ec0380997197dbc44bcbc2f85895f8d070846c7f24755199
 EBUILD qmapshack-1.16.1.ebuild 969 BLAKE2B 86f3517a30da1b086b587ad304d628c00351e18d3ecdc9b3fe12b9d8aeab9e24350fa4f2dd10033917609a4e311811c9c617817a0d11c10b1e74fd4befda6218 SHA512 43c58531b9b231ba9392dd53d18df0afc4454a8cfc336a9f6e905015597651abb228c789318c375840cbc715e0d22d0e32100275f0276fecf82b7a2165f4d1a6
 MISC metadata.xml 832 BLAKE2B d5194f18fd470325a3c98e268794bc01c4adc951a88f7548a52291cafbf010ded0e71beec3b902021e4b318eb5d21b35d2397475df948acec8f5683d003c576a SHA512 d5c8cc820bba367ace5ac27c714b735c22b456d71248cce2a4ed5c67eb80033c3690127887cb3a181628a836dc42c322508058363ec57b06ae823b43aaf63f2f
diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
index 6c1736186d87..cc694d1a04cb 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7f1d7ff286b9..225e8d628fdf 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index c78b302cf7a1..7567a651abd2 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,6 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-EBUILD dealii-9.3.1-r1.ebuild 5427 BLAKE2B b31fee6ba46141d188049a9afdf2ad5d0b2669c920508f339993cff86a1c46bc42e8b87186660588fb15046a12cb8865196f242b56245b9036cb1968dc64aebd SHA512 6c3843e330b044cac3db878dc64ae28af1d268ae5c7bfa9b1bfb321ad630c63ae94cebf3fbbd9bae382f8de9b86eb7bdfde16f418947c8008baf1eaaae8e894c
-EBUILD dealii-9999.ebuild 5381 BLAKE2B e62b374b535c2d0811dab0815a89c6dba7a9cf5e53d78dc57819f9ea64116886ef1d91a8cf5f5d742afe9f58907a61a40e3bf36fa783e8d249017c5f503c6c44 SHA512 c2ca23e70f8c6286b4157bdabcbc5b19c123c65f87c41298ab96f7299910fb14ad4cf6937b6eede901bffb0e356bdaa3898ac696f86cc5928d768c911682fa3c
+EBUILD dealii-9.3.1-r1.ebuild 5452 BLAKE2B 00c6c97f864724df222b7552d3b515dac4c896e457b7696da9d4469a57caf9492f4b398cb63d9c84b0679eb512f6bc8a95eba5de0ece579493a5362c046bc525 SHA512 d20c97218f5887e64f1757a0441252754a8432a6d847805a051066615f395987d6952332ebe9d99ff206ce6e59eb522df607e41b02d1220289860521303604f2
+EBUILD dealii-9999.ebuild 5406 BLAKE2B abb74cdc508389200664c17811076ac7db4103c2f571bbe0c47be0aa09662c4c2c66e0b59765b92edda8b0df916a643494bb3589d60a3712ef234cbe77bfe54e SHA512 1f71bcb34704ba34ad80f70e656a7f377a7ab1ad225e30de70ffe3b91be3e2db4a3cfe96acec5b0104723c051285ebc5660a65f6280dba982f2ad2be95d4e1ea
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.1-r1.ebuild b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
index d04780a09d95..04391b957f7f 100644
--- a/sci-libs/dealii/dealii-9.3.1-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
@@ -46,6 +46,7 @@ REQUIRED_USE="
 CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
+	!~dev-libs/boost-1.77.0
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/tbb:=
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 3b0443a7d4cc..5008b37edf9b 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -46,6 +46,7 @@ REQUIRED_USE="
 CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
+	!~dev-libs/boost-1.77.0
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6f68b1303609..93e1ca4b1259 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,6 +1,6 @@
 DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
-EBUILD fftw-3.3.10.ebuild 4007 BLAKE2B 9758ecbf92315d2c713518d63e76f94662c7b335fbf509c010be094da25aea6a621c32ca323d224765c8561ee4415c860ce4da41032a3c6b13521165608f8337 SHA512 341ddae2cd7406b0323951a024f2eff16e9e155bb2b3123b31a3ba4820a3e16ed5f95a7b6b388ac0edc4d10f3c4434ca034b3ed2ea7935a38e54aa32eb40d496
+EBUILD fftw-3.3.10.ebuild 4005 BLAKE2B 301714de0c8c0355f8b8411ddb453a238d609f47a85f939525de1a30ac47f7797d6ee3f8dc8cde079c1aa659097524779297c6001b49484081cb7261ddf2600f SHA512 5258c71a636bf8ed29ce59135afa8576aba0a749a5fc9917099d37723ab86611fbd53f45c47555a287382fabbe85858e0f6e33430bc979654685b2bb94707718
 EBUILD fftw-3.3.9.ebuild 4145 BLAKE2B 0dd89a7a96ecb4209b9e45b11300b8b66b92c9123ae02965c243c6b07ed624e1ae836a9e673d331bc753a6b2309e93d8aa058b3a0d3f28d03aac8a6d52e19814 SHA512 4e668945d603046a785674dad1968bdb2b9d8369a5fd6c69af553cb02656ebc1237b3e96f287123df8a1ccd0612645db8610911b404a880af61493f8ac15375d
 EBUILD fftw-9999.ebuild 4012 BLAKE2B 4acc326f3ea2c3d68018aada983a6df9a82a60e8deaf2072b1c0649c4b6a673f3f9a96bfa2747d092de9c99199de4aed38bd07ce46bb8d9b5818cc4feed3ca29 SHA512 861ba96a2f2952dfc72b92db0647719f48443f11e7fbf39ebfe699acc231da40fcb325d29642b535811aa5bc3eb227afdb6eab64e547b85c23859e8807f5e844
 MISC metadata.xml 960 BLAKE2B f9bd9e8190241bb5c757b521fc7c0d9adb608d3f616f4bd32c7fdba895a464e49c6eb3080d849c70ece5993f2999eaa22b08033954b60c33834ea1af8b646df7 SHA512 21ffca8724d5e4a73d9545bd1a73dad15d1341cc15a5340172315d1ace97cf5fda30973685890b7b18255feeb67f80317fde1b9d951c4f114b1d5e45a1587a7c
diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index 54d8ba2fd296..6b8b39b12013 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	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"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b29e7264181c..b3baa933dc5d 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -17,5 +17,5 @@ EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d36
 EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
 EBUILD gdal-3.3.1.ebuild 7639 BLAKE2B 652fd54f5831da35e2c1c72e2a4f426aa35e3f0ff229c86206f3b46837819c58906bb9430505ce43ef84bdd9574ce8ae51f8c17e03eb0608bc4777fd8dce5996 SHA512 50d16549833be758b5e25bb689ed9f4d45d52dbf8b581fd323f2c50f0e228552e8fffdc6440c9b78102cc567e448f2a63c60a56a706737e3b2b8ac2039fd9a90
 EBUILD gdal-3.3.2-r1.ebuild 7740 BLAKE2B 88824a6b876311d97275f10dbf1f49acf14bd9714a93c3055dbcba56d98c695dd48bec11cf177d551483fdfa6cc71f75f42c5a010966afa9863f3b50a79c21ea SHA512 715ccb891b4768f51dcd9549d0e9fd96730eb81b2dc4dac0c61076d8efc1187b67b4b24cdc44eada6c957d4fe91aae77f9763185ef204011ff07cd61a46f987e
-EBUILD gdal-3.3.3.ebuild 7856 BLAKE2B 177ff1d974b41140cebccbf13d828a75ce92364e8712412a3da7b340fd633e49bbac16d1dc64570a09cdbfaec86e1b6ff34ca36e6d5a4ab572196ec6ff4b4800 SHA512 994245ae5e2da33c7de36e1c60494139a6c5b0a90e2db92e9fe343d1c857f3739f92b7e999748819351c860c42ff9ab0dd06b1b75b28f19f04a38cb0c8a6e6c7
+EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.3.3.ebuild b/sci-libs/gdal/gdal-3.3.3.ebuild
index 2b87447a3b16..0759a1e57028 100644
--- a/sci-libs/gdal/gdal-3.3.3.ebuild
+++ b/sci-libs/gdal/gdal-3.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index e08c3d5c22e0..b93969d2c096 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -3,7 +3,7 @@ DIST geos-3.10.1.tar.bz2 6714713 BLAKE2B 932a24a7431bbd14b7412957a028a42b3877247
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
 DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
-EBUILD geos-3.10.0.ebuild 890 BLAKE2B 10f22c828827a2758b4ecc268d06f3bb4c3a6ef387f943cd7027259adf19b0b22137cae7204e6a0c2c82bc439e6aa0a5340619d239f73e1742252c0e1aa1393d SHA512 42052da55b5a81e4dc212a3e3b9e6f61d0de62b8dcebd6ebaf87027a5687b00f574c310b2005ed1631e99b75e869f51da3810840ae7d0027724464a06335b681
+EBUILD geos-3.10.0.ebuild 888 BLAKE2B 96b1dfa4ad95018b26106cb704c0b715d0e448be62b49f44d9dcd6a31e361ac785910bdcc87adb96cfe5898f474696eaa2181315997108439d4b734bc6ba7758 SHA512 e9e3f1f1a158c0beb5ca80e40180b763998a7f4befe974185deb6f670d1ff927e134e6d6ff6293ad47ed6820b86263a1e8b7a536c97a6f7c74607c123c0b10ca
 EBUILD geos-3.10.1.ebuild 893 BLAKE2B ca41569fd2015ee64f20642b53f1c4958ef050189124e2090503e44603e61290cad942f202d170379ddd10576be3f7df49b321bd6277c3bda7d88d2267fc300c SHA512 944a4341ad44c0156e5cdcc3f81c21073230ff56dd7ed5d3acd6049f0c5663a64000c092f8aa2a7ccb355f311a7df8d73f5f3b411469379c79858b40be2a713e
 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
 EBUILD geos-3.9.0-r2.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc
diff --git a/sci-libs/geos/geos-3.10.0.ebuild b/sci-libs/geos/geos-3.10.0.ebuild
index 3fff38dea08b..f83eaf12b589 100644
--- a/sci-libs/geos/geos-3.10.0.ebuild
+++ b/sci-libs/geos/geos-3.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index a586f1007629..808ba0db08b2 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -11,5 +11,5 @@ EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb7
 EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
 EBUILD proj-8.1.0-r1.ebuild 1498 BLAKE2B fbbdb247cd29bf471e0ba6e2a5fe6b7e171c31e626ba2718e05ed2154643719d239cf4e2e20539134c45c31cfebff26b5bea98d88ce707a61fa30e4cefd08eed SHA512 d3578c54ee71ab99f6994df2aebdbe8b7f33284160ff14a684f7582a6fc9b1008a4ba77a6e04a3ab54c5648d93ae2d243c434bfeda26068d8cc39aab12d0996b
 EBUILD proj-8.1.1.ebuild 1298 BLAKE2B 2880810174ab266045211695a1af20a32289675766f0557eeef14d63a153c1dd3748ff0fb458b5965928507e6182d8e6a7ce077a236e315b9b4dbbafd0fd49cc SHA512 d0bc55182ee6c3f83fd5d1c97a53d80d864eeabdc018862cfbaa18db7bec2eef75b24965120cdbacf4c3ab9ebc8a05868c86fc4cfad152622c16f50bfd9963b4
-EBUILD proj-8.2.0.ebuild 1428 BLAKE2B 5c6d13b5e0c59b6f6a2ef498a31f89476b2dc9b1c2c64062ece9bc4dd8227e6798f840009f489eef5051716f2d661c2cecd6ae35a5b763c884598f3055bf5bd2 SHA512 de8368332cbd047dab268d480c0e20cdec93f32edf0e310dc5bb49047b9ca3012f54fd205a6ab91dc786df9de1e24cea22b41b8bf17282de85248ede28c3ddcb
+EBUILD proj-8.2.0.ebuild 1426 BLAKE2B be7f95d899ddc8d10bdfdd682cb73fba9949c21feef1e657637aa840add94dd5161fc57cad6bd7775d15d9b20b8b9d6bfbb2c06eb7a4ceed82b3f8e979f96509 SHA512 fa971dc5e7ba297e46c3116105759c0f6acd5d16387519d4eed477ddaefeb1a84af3b0fdf26518c9c411e2290d4646e41ddf7708c56e7e9e3347086d587d3830
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-8.2.0.ebuild b/sci-libs/proj/proj-8.2.0.ebuild
index 786b135913c0..6824f59ebbf5 100644
--- a/sci-libs/proj/proj-8.2.0.ebuild
+++ b/sci-libs/proj/proj-8.2.0.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # going to correspond...
 # It's far less confusing to just increment it again here (so N+1)
 SLOT="0/24"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl test +tiff"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index dfdf032b77d3..e9f178e4cb2c 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -4,7 +4,7 @@ DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc8
 DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
 EBUILD scotch-6.0.4-r2.ebuild 5042 BLAKE2B 3482237b7fcfaa11a4c1b0845d780059823ad509c823d41f052991b6a8977d6cea0ba1e96e5270a6d983a313300a6cb6e41ce7a94d7bb8316d3c38be521f1e9f SHA512 c376bc48a33a468921001462b116a2de43717d33b18e018e45f04efffcce034ea3c64b1eedae31f5a92e744d41bcff39cfc50ef0ca0f76f1062f814d40eeef46
-EBUILD scotch-6.1.0-r1.ebuild 4951 BLAKE2B 5b30bbfc10c45bd4d78638457bb7efd60695bb397d371f454a7f793cd897f7ec82bcff56fb98bd632db82baf2babc09110b8c38e72f327d7803d7ac7e4336297 SHA512 a6a4dbf66895d0d0e9aea5c5af04ab08148a72fcdb0698d3cd6c7c4a10e1c55089b21557115b7b1728303fb0bc56ed70766fe5659dee713e1e911e000e933112
+EBUILD scotch-6.1.0-r1.ebuild 4949 BLAKE2B f9ad61cc69a0ff7334f44148d405fff85491b71ee8e954a64eea476ef9744dc39870d994120e0b584999795227c35423a44215e399fee27574469c137a57bfd6 SHA512 9f7210c730b4f67062c8fd13643772240159c0b79b277940aaaf8f7d64783dc24361975b45cd5c95bedc3ca600841985fe32f234dcb2b81369b16729aefd055a
 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
 EBUILD scotch-6.1.1.ebuild 4956 BLAKE2B 90be76fd85e027e5649cf580e683168dc07010b1e4369a6c642d2b94aeb191b9f9944f416160d19117507dccab39dc643a3bb0db130ec691174adefef1129d33 SHA512 be8ef59bf19d25ccf85f4d5aa705f05f6d226f48e05d7d2b65d3fe52297ee6bbd944130119b781a1109fb1c47dbb2de95490c1c555c1058d9b972b06b9230463
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.1.0-r1.ebuild b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
index 04b11a76de4b..952cc6463c3f 100644
--- a/sci-libs/scotch/scotch-6.1.0-r1.ebuild
+++ b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index f88f2160d23b..695fe701fe47 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index d1b4b14a11b7..0efff70c1ee1 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -2,12 +2,8 @@ AUX arb-2.18.0-build_type.patch 866 BLAKE2B c127152e03d8dd532558a7dc95e4dd2cc107
 AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064da968424520bc81af242b58675657a7cacce0921076cb5525e00e2d6c33f2b75ed898ffdba7ce730855b09f2b7f8863a1 SHA512 ec9de9a642dd4cb859460132ed597474df4eb2b3f28cdf3ebcb5109fedc2866eda91b0d301149d94f71dd67c105a1dda3d0aed94dcfe34c9ff9fc4083ee6817c
 AUX arb-2.21.0-gamma_fmpq-testfix.patch 2291 BLAKE2B 019af88d2e8c56cd9fcab960fd8fca6f0fdb74e69e72866edcd437700761768c78bd0cfa925ed9bac1c33e4e7c958bfca7939b7cef7c1b7186537dd0573e5414 SHA512 fe40677a95996f54121379e5bef0921e13923be80c68a7821177b371d71d4847e4ed903f3bc0c266c6c6de7fae9ede7cbaa59d5927b4bdb3cc7e58d588aaad68
 AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d35a9c9182b6ba9ced2d786866f8a15a4dd07c97a2702d723de98f5e264a5ca107ad24dc99095e46485fb75696114c6909 SHA512 5addd977a49fa5e9ec9847b07a3043d78ce7d7df5d6947ae895dd345424fa1941335e7a3691cee1497036e33b47fe1858e42b07277629956fe0299c4034b2d79
-DIST arb-2.17.0.tar.gz 1589083 BLAKE2B 68d5b04dca24129ceaec4e05124e35b474157cf1efbb6505121a03058e014cd4eb67b99497dbbafcf62e9e31f9d11c92f749f6e047e6b1513b6c0cc5ef8f22da SHA512 201e0cebbd1c4857d194e5531c76c6e45a478cf6965b836818919adf0fc04f0fe25e16ecd49c62a438876b67f009b872c4f3c774fe35620be0b22c5e08bdb824
-DIST arb-2.18.1.tar.gz 1595831 BLAKE2B 010ae7a17a9cc1c11ded5806ff761115f3e78c48a5d8fc058eae0715b1e00e40345d4e6445a84c71c37627879648f445663dcc3bbcebdeaac8439a993ade38ee SHA512 07afb45829119bc695926dab4221051b221c2cc3952e42c9928efc74570b05fc01c97ea86b1b67c16d7a19a55b4e32dce97e08c9b72f36b33dd62bfccd19bb05
 DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
 DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
-EBUILD arb-2.17.0.ebuild 2025 BLAKE2B aad028595287b91057475d8ea72305c8f720558917009660ef09502e5e22c371192eb6c0e52f281d6fdf9944cbf2038b9d39b1ca7ad9f5a5337b5e796f49bd92 SHA512 5160ed2793dd71af6005ec4ca75bc404c880c149519b85b3f19c51da2321ffbe99b0c6bc7e41dab1de6f624abd16bb3fcc55479dd8ae6cf4af20bca3a3954ed6
-EBUILD arb-2.18.1.ebuild 778 BLAKE2B a8b078451c6ae4907242d87c08a39814bf1c4e77648ed20ccecdc0a93810e3553b03e01aea9a194de9d8c853f871ce016717c95a5cc3dcc53604d1fb77a5067c SHA512 edd48a1e3724defd85700a5c6ec6b98ea9c12cae5f060c540be4610c7e7c8cf266d76ce7522bb482f868e8bede4430d2fd88996d985b6ea294ee79cb4713b938
-EBUILD arb-2.19.0.ebuild 751 BLAKE2B 84cdad6036faaf1a78268921ce0398addc31c6ac4e70681af10794f1c14c50545998870d31c28d8d59f0479ea7b9de395b8e9668daab66e0f2b2f894476d4978 SHA512 c484d59ebfb19fd9a9e05f69c9b7a246bc2e2d6802bb3c938afd3fefc82d984c7545c9b4314b61e949dc05ede11d222e377a66e50eb3123e385d643e983db125
+EBUILD arb-2.19.0.ebuild 749 BLAKE2B 05815e6f1635924824d5173ad0558627b5c98923b384d4f0dd2d369b7158acb0923f2f82d7d9ec29cb3f48cb30a402afe3adb3850d60ea60af5d95e4d1633dca SHA512 d7d9d2e1dd92cdc541de0212722b12c2db5eca27b00684f24af34d0829e1de91ecdafb731880d2eda177d363929e3bee3aa68f8a41f277f88b17a1554de01974
 EBUILD arb-2.21.0.ebuild 794 BLAKE2B 31d5e76b4f9f2ae55c16d92826619035b0ee95f1e3be0f59d4bc1abdbd5e4c0358c24d4470e776aa72df82cdf45d495aa76646f9fe6505c26cff8b1bfc3fffe3 SHA512 a6b065d708ffa164a09302ec40a601073cb980c4a4e8fbe3e52ca46d94f2e2311dcb3fececa17210dcd1b2d8939c8240c73aea66b46ac90ef5a253c25bc37648
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.17.0.ebuild b/sci-mathematics/arb/arb-2.17.0.ebuild
deleted file mode 100644
index 70ee466cd34f..000000000000
--- a/sci-mathematics/arb/arb-2.17.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="http://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	>=sci-mathematics/flint-2.5.0:="
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# The autodetection finds "lib" first, which may e.g. contain 32-bit
-	# libs during a 64-bit build.
-	#
-	# Copied from flint which has the same issues because arb is just
-	# copying flint. Of course flint doesn't have a line for itself
-	# and, it had to be added.
-	sed -e "s:{GMP_DIR}/lib\":{GMP_DIR}/$(get_libdir)\":g" \
-		-e "s:{MPFR_DIR}/lib\":{MPFR_DIR}/$(get_libdir)\":g" \
-		-e "s:{FLINT_DIR}/lib\":{FLINT_DIR}/$(get_libdir)\":g" \
-		-i configure
-}
-
-src_configure() {
-	# Not an autoconf configure script. It appears to have been cloned
-	# from the flint configure script and that not all the options
-	# offered are valid.
-	tc-export CC AR CXX
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--with-flint="${EPREFIX}/usr" \
-		--with-gmp="${EPREFIX}/usr" \
-		--with-mpfr="${EPREFIX}/usr" \
-		$(use_enable static-libs static) \
-		CFLAGS="${CPPFLAGS} ${CFLAGS}" || die
-}
-
-src_compile() {
-	emake verbose
-}
-
-src_test() {
-	# We have to set the library path otherwise a previous install of
-	# libarb may be loaded.  This is in part a consequence of setting
-	# the soname/installname I think.
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-	else
-		LD_LIBRARY_PATH="${S}" emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-	dodoc README.md
-}
diff --git a/sci-mathematics/arb/arb-2.18.1.ebuild b/sci-mathematics/arb/arb-2.18.1.ebuild
deleted file mode 100644
index ec1bac182a3a..000000000000
--- a/sci-mathematics/arb/arb-2.18.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="https://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	>=sci-mathematics/flint-2.5.0:="
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.18.0-multilib-strict.patch
-	"${FILESDIR}"/${PN}-2.18.0-build_type.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-mathematics/arb/arb-2.19.0.ebuild b/sci-mathematics/arb/arb-2.19.0.ebuild
index 7a20eee66908..a841702944c9 100644
--- a/sci-mathematics/arb/arb-2.19.0.ebuild
+++ b/sci-mathematics/arb/arb-2.19.0.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index e6e56315a70c..e789e1f48f31 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -4,7 +4,7 @@ DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252a
 EBUILD coq-8.11.2-r1.ebuild 1845 BLAKE2B 2d6bbe0787ce45b4e5130d3e9d3ec61f527fc72f2f9dfef15180ca3dbc1f46f34e7cd847c580df16a8affa97e9430e1fd045a14c4dd3bd02bc52c67d1211c55f SHA512 b39833afcbb6e33a7917f949258e91a1a11229ed68427644f80ce84a00b7254a17d8e6e41c6d778184e54c6d8928ff62cc840eee77239feea5cbc12dd3731972
 EBUILD coq-8.11.2.ebuild 1828 BLAKE2B d07bc2a17b827c6e063e45b8f025b492405d30ce6e1a5e8e297bdc4395da7a3d2f7bf8f5ad25e6258aad3a386f5cbf22bae5a75c442539ba88845e52b151f3f1 SHA512 f1b63d03e3e0a22c6491171ea481f44bbb178783ad7d8dff90e96dca6aa3b28392e4d05366f6bbfd6fcc7417f4a01349f206a994c5eef3b07adb64b3deb43184
 EBUILD coq-8.12.0-r1.ebuild 1830 BLAKE2B 8a1608893ea50abad518fdfbebbacb01967896d4850700be4952adac3118d76246d0e7484d7fe88c79de873d959779152c2e7ca7a628b1d618652e20e9f0a987 SHA512 f9e0119093fcba4a17bf26fa8df67c88c25e60fa4e49e39dd981bb21b3e399fffa7fdf555cd4e1ac159c88807cb7c807ade22fd35d9d68a633807dadd2906a1a
-EBUILD coq-8.12.0-r2.ebuild 1849 BLAKE2B d06252eb2c7e81c38d039db39a4d5d49eec2086919252e68a88ac018f5ed9de5af75eb4c584808d931964e0c00a6be2cdba45b9e8dbf218175d2d2e1723f1a8a SHA512 cc5bb8735b0c69b306201e62461547788e7747b0f0e489442afbe2f3bbdd4f7e500843d6f9d1d9c7c1117cded48317384c2fdcb55cee007c650db53db70c9777
+EBUILD coq-8.12.0-r2.ebuild 1847 BLAKE2B 57496afca08cfde63635e873dc6d59d32356daa211d8a140820e07398f54bb38c114ac5ae5ad7ad101a6514117dc469783d3964aae18b27a54b18330087e5f49 SHA512 84fee1004970f88cfccc28717d75fad765dbe8b27ac7dae964e5729e47727f846ac69417bb5c585a68668396896c52a5f8421dbf77e73065d8ac7b9793f4900f
 EBUILD coq-8.13.0-r1.ebuild 1821 BLAKE2B 785a17783ee06916fa171449aebc1e54437f878656862e3cec93f1499097e80b57994e37dc597ff571dbe5d45fc19b984e1d10baf8b0b61e2a7c8cfd6b851d35 SHA512 e35a981b036d089afe934a9bcfc96da2d965fa17b8c90e38b8fe2194f9aaf1b693ceead2b26e77c1e4ee4ae23124bcba9aafdb6f17c5fa5ba0fa955b16c1fda5
 EBUILD coq-8.13.0.ebuild 1804 BLAKE2B 6b443acfa491ea6185cd5fda18337b4a1608a17e56794ec84ef20aff4fae1a941ea0d2b4060f3f5c66f64c580957742c7bb6d9bdbc88f01302da5a7fad234e59 SHA512 52dadb822e75899e0c7abb8b0c4fc4f0c241b9b4c52e254d9660d3df459d551d6b2db9ed57dc797864fede37e8b533023e90b6e003d04dd4d16f1a97a5198fc9
 MISC metadata.xml 939 BLAKE2B e8da08122c0821621a51c3d0fee7d62302a7e0f2f5c37d5787ce2ee613df299a1256f78bbb1d1c6d045076055aad6a25849a02000b97be619b9e984694315ac3 SHA512 98ae3bfb70f27c4b5e5cb18ebe0b9b93ddbb855e426eb54d019957253b3077fc32f0810aae4049f1fcd53209da863addb4b1e88b21ea7422515ce387bfdbdf43
diff --git a/sci-mathematics/coq/coq-8.12.0-r2.ebuild b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
index 8ac534f46bf8..71295a252044 100644
--- a/sci-mathematics/coq/coq-8.12.0-r2.ebuild
+++ b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk debug +ocamlopt doc"
 
 RESTRICT=test
diff --git a/sci-mathematics/gp2c/Manifest b/sci-mathematics/gp2c/Manifest
index 00bacaf16a86..a1c89545e3b3 100644
--- a/sci-mathematics/gp2c/Manifest
+++ b/sci-mathematics/gp2c/Manifest
@@ -1,5 +1,3 @@
-DIST gp2c-0.0.11pl3.tar.gz 854003 BLAKE2B 478307b9fa56b8e58a66001bbeac3ce6193a446cb6a339bbd65de9105924fe92a0e9c39302d836c7f3e7d2fe100ac678514d4e7eef1bdb0b880cc55763002864 SHA512 06d3680da739ce13a0a80a88c7b07a9b336acecb95f4841d8e984f1d4b66ad0a3ffe47e2abb77ad7e564fa976d16c468d62e6ddc15ede3beba00db6d92a91d97
 DIST gp2c-0.0.12.tar.gz 872289 BLAKE2B c72f092a0a8e335e68d14f00970bd4794d883194718dd89cae760e06b5b89bd1b1959389d422b086f7862870e212662fc736f1f6720a389b9484ff360d9b8293 SHA512 9dd13c37e7ba36d75614249b6a2ff62350b5c02ba519b2c5d2dc49c36e9b6672134902b5f2e6b23f42fd4ff2069bdd12bd4694f324ddf814296bf8cbe5f10cdd
-EBUILD gp2c-0.0.11.3.ebuild 742 BLAKE2B a2bb2f3dd06891f6de3820ad1be89cc20da360baca17a9d50799d53fa29b4d970dc71e1040b34d20dcdc400f7d713e48cd11572b208ea9957f059d035f862632 SHA512 687f09f327280375420ba5bbe3c97a6ded1beda67d7c81754a6b4d96b97ea460b4f770365da76a446f1a230f8ca9e13dc67909e954e6e4d874e01b3d963538e1
-EBUILD gp2c-0.0.12.ebuild 745 BLAKE2B 56aa38e97ee34eb01abd5c848e40452f0a5788633a451a9d77fc9556c6ea9cb7653187b14991c1371ec5ccab778fa3a45ec598ddeb9b478b14c0b53e69f84479 SHA512 2f3e38c74ef3aa409de6277155ee036ec5690d1c89b709285057c1d508fd573e26868bfcc4960f2bb5421f34320027fb8c480bea096a14fe395cd8dc7d077a1d
+EBUILD gp2c-0.0.12.ebuild 744 BLAKE2B f8b14d9553622bdf715ddd08b91b1e0971902d1266862f36c6ca2c491ab0da99d525173b69cd135bf022ea3b3cb8e2541a45fc0ea2cebe39b470c0ea82b22cb9 SHA512 9037a37dca231066f8e6e171dcc5831eb5fb6219acde60d924fbfea4ef4caa3cadf38e187f95c4507810e2883707b9a15313418fa6edf84322d7f6d43ad4e649
 MISC metadata.xml 917 BLAKE2B d95126f6c76cde12c15df2616aa74e3d408a3bd8dc5e18191a8cc752ce933f39d50bb7466fea085d6058707ebac3978ff7f726efe8b50a0b80a33e6cf543b81a SHA512 6644d0abe179f74576b3ef94b04a078935f8f1a306d9757ad48c21b41163988728e1fe0abcb6d454d8e027ee4b67a31d8dfdb58c5ea1f1250505851fd0eaa49d
diff --git a/sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild b/sci-mathematics/gp2c/gp2c-0.0.11.3.ebuild
deleted file mode 100644
index 31fb4d51d216..000000000000
--- a/sci-mathematics/gp2c/gp2c-0.0.11.3.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
-
-MY_P="${PN}-"$(ver_rs  3 'pl')
-DESCRIPTION="A GP to C translator"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Perl is run on the build host to compile the descriptions in desc/,
-# see for example desc/Makefile.am.
-BDEPEND="dev-lang/perl"
-
-# This is the first version of pari to put pari.cfg where we expect it.
-DEPEND=">=sci-mathematics/pari-2.11.2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf --with-paricfg="${EPREFIX}/usr/share/pari/pari.cfg"
-}
diff --git a/sci-mathematics/gp2c/gp2c-0.0.12.ebuild b/sci-mathematics/gp2c/gp2c-0.0.12.ebuild
index a723e8a4894a..8c4c0515069f 100644
--- a/sci-mathematics/gp2c/gp2c-0.0.12.ebuild
+++ b/sci-mathematics/gp2c/gp2c-0.0.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cc51411fe5ed..eb75f1bcc744 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index a12152040a1a..c7f1a95473bd 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,4 +1,4 @@
 DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
-EBUILD findutils-4.8.0-r1.ebuild 1927 BLAKE2B f8b1178850ee0fc8f6adb01121534ac05867a8dbc997d52168eaf492e100c3e5f5fe21e220eb6f80cc8d2f5304f91c4b184a60c131d9bf38d080fdb0c3d7c3aa SHA512 e933ac57f5c24e604201eb0b2d2cd424f0dd0fb959c1a64393fc9b4f56b5351fb7e53cf2486b7bf8a468d3fea79448148f6cec6420c9c519d599c306d689ab51
+EBUILD findutils-4.8.0-r1.ebuild 1926 BLAKE2B b96794ff0a5f2c963dc3df512449b4fa8d4e799d602b087430a28c49c7647f2ea026e1f0b31da74de347fcc34c2918970cc11001c69e1fe3a56118ab6c6e6c67 SHA512 6dd08ca4d0b46b8e50b774c6fd319d44729c7868dbca2b31946b4f0cc125908c4a0161f06fac2521b542fc51330425624902c31317830793b00e2ac1392b350f
 EBUILD findutils-4.8.0.ebuild 1863 BLAKE2B 7e463fd8ff4115740d91e97fc9a74c2dd998665c632ffe956a51ac43f52b8a0cb843513fdc4b6464809544de013f0288eaad0bf475358ef1d82bd1c153442866 SHA512 fa42b34ec7d561a5e4143f3690f0df99e53b678722c58ba83f7f286d9fea0e2bf248e7c10ecb630b907d406858c87e5292d21b34c414ca201b76fb951c97f33d
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.8.0-r1.ebuild b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
index 8dd3bb18c5a6..670f669c01af 100644
--- a/sys-apps/findutils/findutils-4.8.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.8.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~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="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 4615cd45e2ce..b94d3ae7a804 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,5 +7,5 @@ DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a3
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.4-r1.ebuild 4477 BLAKE2B 899806f95e598ce0823a8e5af810b4edc5387884393e03fb51f3fe81cf37eb2f4cb96ec8461b20a4d0b016c142a9cb05113fd1fa6249a6883b0d92b780c37e02 SHA512 71e80891822d1e1a84cfa742ddde3fd7d6213ec9374fdfc7153db66d18129be99fb4eac9f137aa7b246dc9643dc6ffd50a9b728e9fc6b989a955b31b8417c019
 EBUILD fwupd-1.7.1.ebuild 4607 BLAKE2B 2a4f91e570ce3d7f0c204e46e7abd02fc78a8828392610ab94e4e721a4ade946477fda9db231f59cf929b7e0e7539d2ff6821084306aa6defc3c890fbaa6532d SHA512 969c631fa511c55473d1521d886c74de978f139a77de701f37404300ee33cf987ba44bc07a4b634a9ad3c7d8426efca21d6f10af560495a5ff96e899dbd0402f
-EBUILD fwupd-1.7.2.ebuild 4692 BLAKE2B 4ac7f8d7829ee531775f4617cb35fbb389cbd6d4b0180376d15167d5959ea41a19c258a4bb2d21d20981bf39c120776524eb60894cdfddee9e6b1b05b72edfc9 SHA512 6258d44b5ae09ad8efb989abc73e427929839bb6b2ca7b03a354092ad3f7ba163f7d5692be91e868b2d3515563b9104fcd710fb3cf533c21e15ae4551f3034a0
+EBUILD fwupd-1.7.2-r1.ebuild 4537 BLAKE2B 65467912a05779dc240c443ddbcffb972920ef8dc167d39dce5c2aecbc3807f489f8552f7b03142ea9794e8c559c667d955564e29c131e79eae61f53ec55e1b6 SHA512 b255f982ef1a225cd93ccd7ccacb2e7d593f72d4a9326a62c5f73c862ffd1ee95f52bd0b87a026a98b3a96e1445953ac4182f43beb5b732f1c9ac4a0f058c3f8
 MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
diff --git a/sys-apps/fwupd/fwupd-1.7.2.ebuild b/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
similarity index 96%
rename from sys-apps/fwupd/fwupd-1.7.2.ebuild
rename to sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
index 4db8a29b8c7f..020a288c2927 100644
--- a/sys-apps/fwupd/fwupd-1.7.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
@@ -50,11 +50,6 @@ 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/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		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/hwdata/Manifest b/sys-apps/hwdata/Manifest
index d91454a370b2..72a1019a37c9 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,3 +1,3 @@
 DIST hwdata-0.353.tar.gz 2206215 BLAKE2B e1c30d7d486a2f03eb8b59dfc12544a5e5a988295d5dc220e2d6a344991c62d8ded0e8e71a8b0907fb9fb7fe0bac8528386cc4665c903362db6ed6f0a6985b94 SHA512 f4bdea533a1cdf406d065da6a684b131b30f6a0b8fb791418d54b756c9297da981a8e25e128ef97af50ae88553e1473dba17a29c11a15490065faf9bf2dcd0d4
-EBUILD hwdata-0.353.ebuild 700 BLAKE2B 560fef750a18ea412860c2c20bf7dfb282815a444f8bf561ea50d71ab4f137f8ea20998e92aff31cd97777ee8749ce8690de17161546ff481643ccf50d2c0668 SHA512 0c5f07f113cac81198692dfe735ed0c53b89e0e6c5f654d93147670ea60d413dbc0399a8e7c4fd72285249741337b541453ce0a672b914359ae90aeabec679e1
+EBUILD hwdata-0.353.ebuild 693 BLAKE2B fe89d5cd31ca413ebcd1e39060b6913dde0b3637b888ea5798d942e826932e3ed08aec0f9034a6a87a1222a0f0b6e6c12159b5044c7f14c6eb0cf5636fa498da SHA512 94a81baa7dd3974fba28c6c5ceba29498dcf1e8575c144316de88b566a68819fd726ee008adf014ba36fbddb335944a7c398b8e585b5f8eba0943a57b2c711d5
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sys-apps/hwdata/hwdata-0.353.ebuild b/sys-apps/hwdata/hwdata-0.353.ebuild
index 3f9c9fed8390..881972920216 100644
--- a/sys-apps/hwdata/hwdata-0.353.ebuild
+++ b/sys-apps/hwdata/hwdata-0.353.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-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"
 RESTRICT="test"
 
 src_configure() {
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 59dbb5f02fc5..88db660b8274 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -3,5 +3,5 @@ DIST miller-5.10.1.tar.gz 6158587 BLAKE2B f22db3ccd29e0ff99e3f287e7e4382d679bba2
 DIST miller-5.10.2.tar.gz 6192382 BLAKE2B 73daf0ca8a5417890e060b04103c4542f1122c13a9a13271dc53e94c4fdf0610dcad5ab04729326fd4ab72b47673db9fdf5aacc5a4ca5330c3220046e4d8a38b SHA512 be40611b055d94f3b0ef75b35dfd242dd4942dce3292bb01b48a6a12f9e4c09fc43bb9d0650902c7aa13328d9a2bbcea4da2964af58d07f39ae63b34712a45f5
 EBUILD miller-5.10.0.ebuild 1044 BLAKE2B 74501a4d7622e89ae1bf1653466b7ad41950e3e15b5e25b0d344a28378edd4b9e2ee3950c48669bf8258bc794e9ddee6a2949bad5518b7ca695da0bfff6a714d SHA512 ce2b40ca3f6a0e360bb5a13e87c4e51a4b629458501f6dc9c07d5aa6e06c3077864316caab187e5cbee1dbe8914cdd16d8d7857a1c61a8aaccd83fc2bdbd14b1
 EBUILD miller-5.10.1.ebuild 1045 BLAKE2B f5e71780d7469b52f88b75e8cebbbe15c730b6dc62a62ff3dbb4b27c949e12555fcad34545ee508e86d04dd2b22a98c18d835bce2a90a0744ce578e6f9fbbafb SHA512 843cf472b73a9464ffff14fde046c8ba2c72846fab9abceb190e5271ec894718359cb998eb812f817fab555962b1380a570f4a0f01812bf4e3e8c0a66e80b8ad
-EBUILD miller-5.10.2.ebuild 1052 BLAKE2B 338a89553e6184366a8973c77709dfb096aaba42ac7365e532c050f4c1ef123df4accf2bfaf4e24346488a965213b156de65b7a70135bdd1dc571912b9393775 SHA512 93ea0ed0d4811bd4fe5d148791205cf7d218427be4d6119335c0b68e45dbe8410c7186487caaaf44017a06db39601d51e3fe44dab6f3131aafd0f9e7ee9b6e59
+EBUILD miller-5.10.2.ebuild 1050 BLAKE2B dfb4ca87e6b29681fb9dce541522285db48320022c7c225069050492f6907886e022c19f80adb6b9368cd90898be6f2de8a22130f9128c69a1775d328ced29fc SHA512 a8e5da195457cdf42b1477cd4790add3e5118490d9281328a480b08c4eb4b4e75053a807eef3a3ad10934171ab8b992dc354d16023969a02a066e2f040e26c72
 MISC metadata.xml 246 BLAKE2B e72fc3f75116d3b253685b995328f1823cb6ed7263d49bde4dc8d5d4b4b309efc85bb7beeb3e1d09e0143726bbc8d5028f3acb7a91eae3ca61cc649f8b7cabf9 SHA512 e772f1ac75cefddf23d6cec0cb2a25fa456586307e55207a29d2424d1610618226965412f4d5a1bdfd02b43830ed04b8ea2f0f938ffeb0a5878e1a0ff2f90132
diff --git a/sys-apps/miller/miller-5.10.2.ebuild b/sys-apps/miller/miller-5.10.2.ebuild
index b04d5bda5379..4daa197af23e 100644
--- a/sys-apps/miller/miller-5.10.2.ebuild
+++ b/sys-apps/miller/miller-5.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/zram-generator/Manifest b/sys-apps/zram-generator/Manifest
new file mode 100644
index 000000000000..be9395c137dd
--- /dev/null
+++ b/sys-apps/zram-generator/Manifest
@@ -0,0 +1,41 @@
+DIST ahash-0.4.7.crate 51474 BLAKE2B 0974b90539398d61903ce7fcbecdfcd802fcb5c7ed631be919ec17be6951e68bc80787876cafebd33e40a80605f6e2352a86047077bc40575420bb6ee1a4915a SHA512 2f42cdbacb2b2f9bd7d94a4cc61294d7813428157ce242ba82f7c3fccb6e4b83c767f4dedd35ff26ae61a89506b388d7cf96af4e727c29a14b25b9f82b1f2126
+DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
+DIST dlv-list-0.2.3.crate 12311 BLAKE2B c74bc2b7e8fa65443c8c8c8c44d5ccfa831ce63e3603797f193a12f78f249e5ed0fb57983469355bf3549ce335fdfac43eb4644e648296a1cd3f48f1e59b35e6 SHA512 ac464c8d1ccbb43b48618cf8912067f28e2d4f53d648cd8b6b8f1b2e2688d2e39ffb8d53faa0f665d23487fa7927258e60ff01e10df584a9e274583d8dc279ae
+DIST fasteval-0.2.4.crate 267521 BLAKE2B 2abd639d65e45fb31aada3d776a47eed7cc16f07fc191674fb8018696ef9cecf9fd65733e43702208023f86ef4f2ba7be4d001aada35d34aac64761938b33bc5 SHA512 5328fecd58aadb67cd0f8500c3faba001bcc0c71f3eb47e1e6cbd7bb18248d61bc79985f6a43166a0324121ca1c93425ed7a3447e3d0d4d0851339ed1802a5e5
+DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
+DIST libc-0.2.109.crate 570506 BLAKE2B 629146033110c42a380a8e87f09af04773bfe9609b8430fa5ec8d85b3d8431e430b60b072e436c479aa8f0037410f1a642bfdb92e4a932ed2c875241bfd63eff SHA512 ecc5cff60ef7ef4febae95cb3ea4fc130b1844ee20d046332ea0738c85ce1c0afe9239d9ad5b1a50236918aa1166eed04b5a91ece76e49099e4a5415bde881a4
+DIST liboverdrop-0.0.2.crate 8714 BLAKE2B a60988a848d21390b46538f02a97cec247184eea7e72a4d77bb243a2476d8ac1d88f964c91ffc0ebefd1215c4c7538fb0a835c4cb41bc153ab89e0b2d98b3c6a SHA512 084c2c2e4c1ee787d5af53ce20f7118f9deb4f1f34b242ca1dd928a71515660b388eed94d1eedca108b3f23c4a8dc4e4b778b6b8a8704850989af63a8be20bdc
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
+DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
+DIST ordered-multimap-0.3.1.crate 20631 BLAKE2B 2d874bb9b37ea109cb7840209c4811c872bddb96f4fec4c936400c57e9a16c04fe801eb72a5b4877762dc9afb7d778c15f2c1efdc34a05b9405212cbf14e6c51 SHA512 37b827165659529e02e303a15ae51c1291e521510a11703ee4245f899d45a2a33237a85bc5e10aeb229f16647f544b37f45a35721c6ef6d6c3c75874a373fdc3
+DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
+DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST rust-ini-0.17.0.crate 15155 BLAKE2B 654c74c69dbef6ccea8a31070683b9008160340c0768b2e2d169554032cf5ff58533a824c42af83924eb10c2273bd0599bd397ae8322e7179c978015b31249c7 SHA512 2e89d4a60ba33115d3de5b7da551fd47f2350b3e77cc1148c5141134c7ac2bb87de152c67d4c782ae69d3dc04b4159c28eebab1810ce8b9b11bccc3f1a804410
+DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST zram-generator-1.1.1.tar.gz 26091 BLAKE2B 439f550920c1d1a5ba834f3a7e399b8e4451d3fc70ba29788810e08e89f4009972fa9e2e068ce99484f282c82da19044c8498b4f59083a7df1baeceea8c75ab9 SHA512 3aedcd5fb5588b6b011948569785dbf970a3a574094f020e2e1f5a448db41deaa3c955962a8ade5b178df8749163a6282eb4f24e7256c3a185163aad3eee0d66
+EBUILD zram-generator-1.1.1.ebuild 2080 BLAKE2B d6a78fbe61c718a85f906fc729e333d1b548a308a2031c0ea4de765ccef157def5f156ba7884ddef7bea017f1096ef0d913c35da71cfa36b8e3452bc81f9e6e7 SHA512 98edc49eade47b49b5010924bb647f0d6cf41e979e9e49892be6ec59fc36544bf41f9c0e5e4c09d5a321b829f8c86de5e17c760936bb48fd9737f68a3c1ec37d
+MISC metadata.xml 214 BLAKE2B 62b3dc89deb30efbde7a2fd40152d754b7a26f88cea370780506ce46624889d481122fa37df62bf9a8dbe5def56adf40645fe42ff9e897e4b73a3f8e5de81449 SHA512 54290b536ebe0f03017504586c360f2f5ad4d5cc6bee877e59f9cd99fdfe945ab8ad56cd972fcc2fd3fb6ae4f643a7f2a0d0f6000e00ab7f517777d16320bac4
diff --git a/sys-apps/zram-generator/metadata.xml b/sys-apps/zram-generator/metadata.xml
new file mode 100644
index 000000000000..7398ae3ac6b6
--- /dev/null
+++ b/sys-apps/zram-generator/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/zram-generator/zram-generator-1.1.1.ebuild b/sys-apps/zram-generator/zram-generator-1.1.1.ebuild
new file mode 100644
index 000000000000..bdf734a90fef
--- /dev/null
+++ b/sys-apps/zram-generator/zram-generator-1.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	ahash-0.4.7
+	anyhow-1.0.51
+	autocfg-1.0.1
+	bitflags-1.3.2
+	cc-1.0.72
+	cfg-if-1.0.0
+	clap-2.34.0
+	ctor-0.1.21
+	dlv-list-0.2.3
+	fasteval-0.2.4
+	fs_extra-1.2.0
+	getrandom-0.2.3
+	hashbrown-0.9.1
+	libc-0.2.109
+	liboverdrop-0.0.2
+	log-0.4.14
+	memoffset-0.6.5
+	nix-0.23.0
+	ordered-multimap-0.3.1
+	ppv-lite86-0.2.15
+	proc-macro2-1.0.32
+	quote-1.0.10
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	redox_syscall-0.2.10
+	remove_dir_all-0.5.3
+	rust-ini-0.17.0
+	syn-1.0.82
+	tempfile-3.2.0
+	textwrap-0.11.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo systemd toolchain-funcs
+
+DESCRIPTION="Systemd unit generator for zram swap devices"
+HOMEPAGE="https://github.com/systemd/zram-generator"
+SRC_URI="https://github.com/systemd/zram-generator/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	  $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+
+BDEPEND="virtual/rust
+	virtual/pkgconfig
+	man? ( app-text/ronn-ng )"
+
+QA_FLAGS_IGNORED="lib/systemd/system-generators/zram-generator"
+
+src_configure() {
+	cargo_src_configure
+
+	sed -e "s,@SYSTEMD_SYSTEM_GENERATOR_DIR@,$(systemd_get_systemgeneratordir)," \
+		< units/systemd-zram-setup@.service.in \
+		> units/systemd-zram-setup@.service || de
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	export SYSTEMD_UTIL_DIR="$(systemd_get_utildir)"
+	cargo_src_compile
+
+	use man && emake man
+}
+
+src_install() {
+	# https://bugs.gentoo.org/715890
+	mv man man.bkp || die
+	cargo_src_install
+	mv man.bkp man || die
+
+	mkdir -p "${D}/$(systemd_get_systemgeneratordir)" || die
+	mv "${D}"/usr/bin/zram-generator "${D}/$(systemd_get_systemgeneratordir)" || die
+
+	systemd_dounit units/systemd-zram-setup@.service
+	if use man ; then
+		dodoc zram-generator.conf.example
+		doman man/zram-generator.8 man/zram-generator.conf.5
+	fi
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index add662280e3d..8895c754a200 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 75e09004c08d..e946af257bfb 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,5 +4,5 @@ DIST polkit-0.119.tar.gz 1387409 BLAKE2B aeb605598393d1cab40f7c77954008a03926005
 DIST polkit-0.120.tar.gz 1626659 BLAKE2B 745727445b4946d44b8ea470d21ac131ca7706e83f5dbaf85cf3541ac60a1bbe23b3bf3172a62d9256ebb3dae02d2b2d476e3e0f7fe79a80c47864a120e62ed9 SHA512 db072769439d5e17d0eed681e7b94251b77828c1474b40fe40b94293903a64333e7fa17515a3270648691f04a1374d8b404405ead6abf292a8eb8483164adc46
 EBUILD polkit-0.117-r2.ebuild 3330 BLAKE2B 844d327d9f6c391ea89b305677adf98e823718f620c307586bf96172678dc94a4b1a5ad870e6ebacf0fd579839b73359de33fa0173f46c425e0f7cd0228c6bd3 SHA512 99673f56722f4e105eaad28a3f8e1a9aee1664e5552e940bf286bf84a76a52145745905f080f859ce4991a29ce6f3e47f6ab3d59a012e69ffd71de98557ca8bd
 EBUILD polkit-0.119-r2.ebuild 3302 BLAKE2B e56f5505dfdfa245ed3dd78199de5439d7ff6d5ddb8778d785c69e3900dfdc7f9d4aa46e101bab2eee7ebdb4097eecfda0f9d29be97dbd348629cc218a988d87 SHA512 32e836e9c17bb7aae519031beaf35a3cba4da983bb29e875b7dcbc8ffae5d0a15218147904d0d942557210e240ffb252d9d548c6bf508027be337feba9e61923
-EBUILD polkit-0.120-r1.ebuild 2933 BLAKE2B f7782344ffa0009867989f55b9d900500b2a8e19cefeab61c075bdab777e50894e1bd58b2d0cc8562a5f34ed2f47654c32afcfb3cbe854632001f29bde1e6032 SHA512 bf9fd52ed3359008600fc128c601c9e8a31b22ae962afe14fa5e65019d5d1b7372c0828524baa3d6d4c00c6ff765b52052aee9298493322b5c1e09127cfcc980
+EBUILD polkit-0.120-r1.ebuild 2929 BLAKE2B 26c0521d065a3ec363876a1e7dad8f76063a2255da89755b892cdba7f343f942866fed290a89ea471188f38ad5ae3eaed59e1805ea06caccc984bcb0d46af9c1 SHA512 3712df9a5233ad467493dead6ad46b4919b527576191aea4c9c88825c3f39422f63051b3b8b983379936f1753518744bd63606b5f811068dc6402c8ba2393b4f
 MISC metadata.xml 410 BLAKE2B 5b1bae6f1252bbafdc0ddd0eefeaca74f93ed183f46a2e4f22f36656c681d87acdd6ea86807a4b68350c1c8197cb97b6b421a88f5f0a2322b1fd85c599c09b39 SHA512 9b097838f0e0dfdbb788e4794e667d43ba3f3a08de45fffa5826142b8416afde68ec0202c429f1cd6f79ad9681b050c8aef736a8399d9551ea8784c97c123766
diff --git a/sys-auth/polkit/polkit-0.120-r1.ebuild b/sys-auth/polkit/polkit-0.120-r1.ebuild
index d6361d37a349..0f0f2900683f 100644
--- a/sys-auth/polkit/polkit-0.120-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.120-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv ~s390 x86"
 IUSE="examples gtk +introspection kde pam selinux systemd test"
 #RESTRICT="!test? ( test )"
 # Tests currently don't work with meson. See
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 43459b4734cb..00af51688cfc 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -5,6 +5,6 @@ DIST seatd-0.6.3.tar.gz 38525 BLAKE2B e1bdb85f9432a9a407ea7a72ed5790debf01a41054
 EBUILD seatd-0.5.0-r1.ebuild 1149 BLAKE2B 5d2dea641973020351e6eceda0c32c6d91d8548406cee5b3713cd64a850c08975c2e1bd8be7a2b4f09581d4b88ed11b8fd103e81c30b70c3b101f70d7437f29e SHA512 d60e0a835c74ccd649dc41011d26b4fb5d0a7241b3a5ec17cca3ba1461510bfb2635f5a70a564648de54697625ab6b66d0edbe03ce69a60554b919bb45d31145
 EBUILD seatd-0.5.0.ebuild 1049 BLAKE2B d3e8166eb298e7b7cc6c2263bc95b011a2eaf02957a2e0af9fec7cfcdd71d0275e3ec7576a817e8a4acf022cfe7ec3231be532cf6205ef0941b0b3ca68a795a0 SHA512 609f6607bbad760600413e46a69aa0a349b139e7f6c7cff461b77a676b00561241da9cb31fd1debcdb48b65c23dee1e0c8ae5e0c3b0fff2e89ed5647568fbb2a
 EBUILD seatd-0.6.2-r1.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
-EBUILD seatd-0.6.3.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
+EBUILD seatd-0.6.3.ebuild 1261 BLAKE2B 0825323ec59d7c6f13f014f07234c047271147ecc53fc6643dd7f6bef0baf66334551b65041fa9d903a27721ab0128b05f46173f786e2df20cefe367aa4acfd3 SHA512 3b6126214352000836529229e956be69a165d234c70ecd689b04919d0538f1aea7a0ca3a2101941bf3d56f8c6220dbd724af5fb3d19f8d78b67ddf0620515b4d
 EBUILD seatd-9999.ebuild 1264 BLAKE2B cbc90f21e86f8430f2d1d7fd2b1a96659e7700e5438d0786ea4629b7b4e211a44f557efc998d943009a13e5694566a7fd48d22cbfed73bcbe6e59e6ef04485e3 SHA512 71c292c38490a4125054d0259f77acf26b77aeccc87c72e0f4f87203e0e66c77bf14bc02adc6e798378353e6b09b896491c968d256226331066f4a03c55d4899
 MISC metadata.xml 660 BLAKE2B 9375bcc1d6a5622abfca0cb2a55e2e319780488ed085efdbef58299259de54842a84b8af2f57eb6fe3ad7baa436d83b8116ac9afb6c8e76a8d69c8776eb7438d SHA512 307d307fb80b15a6d2ecfce5784ebe2dc1882e5e62e80d6d3cdf529e07171ca1364241912368e69893daebfed1ba4f1298e54e8f7978e1dcdc777f97f9a97784
diff --git a/sys-auth/seatd/seatd-0.6.3.ebuild b/sys-auth/seatd/seatd-0.6.3.ebuild
index 2c8b264374b9..c8a6b71abb97 100644
--- a/sys-auth/seatd/seatd-0.6.3.ebuild
+++ b/sys-auth/seatd/seatd-0.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
 else
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 LICENSE="MIT"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index d89abf8764e8..fa5e69f7c642 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index 180cc281cb41..f9d119ab19b1 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -1,5 +1,5 @@
 DIST ms-sys-2.5.3.tar.gz 76192 BLAKE2B c1046fa346088bb9abd39c8140479e11525fd1965fffebc0ca6ed8da354e354af6946f4bfd2a68ddca1f0b1bbb02ff94216d763a12f4ca43de0cd9ba1aa4d877 SHA512 18080bef903c68b6032e04124f3b3b9f0eb58517b338c6bd795846d786ee0af6b65760166b591090ad865a08a03346675f3c34ce59c64215059dac1439b558d8
 DIST ms-sys-2.7.0.tar.gz 85195 BLAKE2B ae1b6de38bb4ac275f971c7dfbbdc5d32a645ffc0c32a6fa82f6673fa8788f1a328d9609c2e82812fc74b9c94ea980f257297e67b7fb9536c9d42c0fabc26f8f SHA512 d9828c86a5b316cadcc712ea029bcf7322f89ab31424982fe2a7e23cdb2334a5d076c2b58299f1f312b0d4b4c869a3d7ffadf236230344bc2e7b4a72c668510e
 EBUILD ms-sys-2.5.3.ebuild 671 BLAKE2B e092cb6e2d4ccbe1a36740e5982c442672e7bb39c6a2404f976635d24b76241fa71bc93112afd79d424fec257e1493f2ef9f0f93712cede569f63b41fdde102f SHA512 7fbc604a03ddffd88223b99c1914bd122616f0d66069e0349f75e2c1ade798ae683c1de748bae35c5fb4d3be19e50b17a9bba47a060d4ced6b29f78123e2ee0f
-EBUILD ms-sys-2.7.0.ebuild 787 BLAKE2B 237c243be8121d2b455fa3429f76566ce11e1686d82aa31c52bd0d692e465e8e37854b362794e2b5d90f427ff71a44ce8c9523fac49663dade9bdb69261be4b6 SHA512 dde676fdb140a45958cbd64425b2d4a93b9322cbc8bb68880c4056a72f67173b75f4df2c17a05444093833b2f3207fcff7890fa315e072dae6e2370535a6c94b
+EBUILD ms-sys-2.7.0.ebuild 786 BLAKE2B 5b0d3072602cbd865b90e032ef48c3487053abd5d7becf6c3e1c9b4cb8d0e46d3ea13d9b54c7609cdfaea982081d4c7d3b0aef2983b6747a6573a0069fbc68af SHA512 654b9d3e290baf76fa02424bd09f03c5e0e1fa686f3f120b33f91831c8f18b403e2610efb19488838a49b3311a568ed6cfa15ffe31e0055f2bd3cb4dc166ad3c
 MISC metadata.xml 304 BLAKE2B 664a680cf4696848e156b5e2541ff9aaa65279a4d7517f58df11b8a8f7182740cca13a568e3a126063858620f0a8ee3644cdb8808b3078fd7281dc1e15629cf4 SHA512 5361de62d946f44d10f67ecd5830d69c34f8ec9bbac9a423c3cdc4129f9a249359ef5420201cf3b9c1c45fb115643361ab0d772773ae1351198b790f3c5d6171
diff --git a/sys-block/ms-sys/ms-sys-2.7.0.ebuild b/sys-block/ms-sys/ms-sys-2.7.0.ebuild
index 4d4a480678e4..ec6060dea93a 100644
--- a/sys-block/ms-sys/ms-sys-2.7.0.ebuild
+++ b/sys-block/ms-sys/ms-sys-2.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index cd08ab4e1595..6711e72c1825 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 202016552172..c3c2a077a0d1 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -6,5 +6,5 @@ DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1d
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 52a388dc1e57232d120b745e3089bad0d12265dd7718589cc7af9a8a1defa105bb74d01f76510bcaafbcb64f435b3e4a555c64d2c4538ae3cd56027b769a36db SHA512 b17c07d927462adae1b9644bdfd53d3ab58e193f02e54b45c50cbc9f100adca01d97631aeb85c014069733e11645af47b275fa2cef65b73ebd9c39a1ab40f96c
 EBUILD refind-0.12.0-r1.ebuild 3719 BLAKE2B ca10b2ea88821c597c58b1a801d96e811088ce36b01128b6a4e1719c71b3cdb228580f0399a963a7db09fc02d4ea01d613ab51d60547388e531d101cbead8500 SHA512 9a3a367c466c82d5e92cb0a6ec52d19660db06e88a1bcf73bd12ef43dc4fd5fa4a6381f5c03e2d3a28f1c558789fc85de8b5a0d622d11079dcbc22b707370422
-EBUILD refind-0.13.2.ebuild 3733 BLAKE2B 5e0a073bfc0bf34d15161f0c007c5c8dc1b05124367ea243ebdb8229341efa548f5bf58159e7d5a5dc1423b398f8d8a073298ce78423f6895f6dca0ec46594f3 SHA512 51a0fcf1d4004495624852e139972a83eaae3ecdcb6229b4598c12396bea25ff468b0de6dd1b6cccc3d1e5e2fe5ae2ccaa87aea43f3a12dd20c30deb96ff4d6c
+EBUILD refind-0.13.2.ebuild 3732 BLAKE2B d1b19ff08c3d8a414fd605daeaca564e92f0ba3efd9180dc7e960eecabcfaf4f0fb2144d6603be97e486601b1c330129e92523ce1a41b5ca183d19c505d82495 SHA512 281213176e580222e11e33559dfb5002d9ce2de45674cd193f489f3ecdc9632abb52a05e06c07b4a1a06c8d15ff720b08e1fa382f1a58305b773a655fa53ef84
 MISC metadata.xml 3852 BLAKE2B 5c6a075b5130fe3f3991350f694d9bf0b72c0e5eaad0a52daa15a0cd463b9105df04a4f59f539303daabbc58fa48a3c1190974b3df5fc71b27e0c493f5374274 SHA512 ada8758c6ec63943c1fb6b42430a87e8f78811fbfc4f39e5d6d8db8e2e2559782531dd17eb57fef588bc530b41735d1d8b44b8ebf6d7c992661329fa4357d637
diff --git a/sys-boot/refind/refind-0.13.2.ebuild b/sys-boot/refind/refind-0.13.2.ebuild
index 375df447651c..68c1950f9e8c 100644
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ b/sys-boot/refind/refind-0.13.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a1449135d4eb..b323da70c1d4 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index b233f3b5dc12..0077d4d9e97f 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -22,7 +22,7 @@ EBUILD binutils-2.33.1-r1.ebuild 11909 BLAKE2B 7401764d65bb05f67b9892bbd6e1b66eb
 EBUILD binutils-2.34-r2.ebuild 12005 BLAKE2B 8455ac022e79d7099fa863cd969cff17aa6ff3e3a260120da75b2564bc8eaae3287b3f1242df8daa68f95bb47b491502552f67bb84d91ad9c11684663a4b86eb SHA512 36f794faedf862a43ae5e3895100506c18b12be46ba9e152d694be932a9f9f754539c4faaa9a72ffdcd2410b5555e97af22c1947233a26548242d8e5de37f152
 EBUILD binutils-2.35.2.ebuild 12886 BLAKE2B f917e60ca6585449a67d14de97f653617f0ae86a9fc7f5442443314ca25d4dae6b05338b7d76455a2b64ca5077a57837699417f56752a53678f21b2dc8174cf0 SHA512 963629da28ae4bc0ec436341269f03f2eaa7bf40d2ffa7d7c9a1ee4ac2c29ee8a8ded88cd3263b9155be7d66b6267f941dede3aa0246eb5540831a543b780db1
 EBUILD binutils-2.36.1-r2.ebuild 12788 BLAKE2B ce79b2adc7b9affff16cf23a5465007a1103aaeba4c6a97a73123028452a1ce51d9e305c1b3740c83c7ab291a93f9338eecb48ac3919c95d53e2522ca2326a11 SHA512 dacb6dbb601dd3f1ab214b6c8ab05d08c7f75cdf76024833a8766235ae058ad51394058c5bc357ac4fd323a51d28f360352e0bedc7f726e66cb362435a8e8322
-EBUILD binutils-2.37_p1-r1.ebuild 13067 BLAKE2B 4ebf5ec7d780b35ce8fa1504cf0e732daab35f2bb810979afe0b1406c8a9b9a5da6d04941adc51481dc7ccf0976d28b95daa445f7dad5e112d0ae5e3e43432d2 SHA512 c3b331e42e3efc501e3327b58f9a0692cf6ea220e23387fba0b0d9f82c7ced6b7c4f3de404643e15ce63abb00ad2e538cbe262b72194e0e69caf3899cd543ad7
+EBUILD binutils-2.37_p1-r1.ebuild 13128 BLAKE2B 2c6b39578d362583dc0f5b73bd29de96745cafd9d5ce48cb6dc6588c4be219de19b84876984d35f65759077467f0d364e5737d345e9aa5326a23627acec0ee27 SHA512 7e72f27c8987c19dc5e3c1ae70b7503621f94f9045038bde09ec8a9f2f988a8cfa3a06ea39a1d17ba17e4d0c4c5690b647d271d4837fae216f2eb9ee6e8c4499
 EBUILD binutils-2.37_p1.ebuild 13074 BLAKE2B 962aba0656d4a267d0803f22eb964cc2f5ae354adc2bd74e75b8cfad7f233ea3c4af911f6d16133cd1b50445153894036d5d78c18941a88cb8dc807efc11e1b7 SHA512 db3dc207c1cc072765c056861b3c3bc4bf18e3f7264d08b08578965d597c70ba616df4683ce94426b5d317a862e656344bdbb5afc6728b30e46d3df86e2c4b26
-EBUILD binutils-9999.ebuild 13083 BLAKE2B b1b5a0f27b8b960157962dc5ca861308d95e1ec95113168a815fc95428a4790a7db0b24290b0c95a3cb3a1da572dec5b8cc08c9def1deb53c8884baf8d3984f0 SHA512 b188d46e800f197cc18f62beec9ad72c3de53dd73176d5a4cfa30dedafccc41aaa520b0e0a58571de8cb417d751f1439cc818d02a823808bb04c7de86db968cc
+EBUILD binutils-9999.ebuild 13144 BLAKE2B a8a2a82bf406f442fef31cbd4e7db3a679161ccafa4f24ecd6a92ce9dd6eca896cc3d49f788c297791d1d8ddd5754807d2e59d12d870217f70a327e11d653eca SHA512 70b2ce6715c30d24f803f10d7edd66d556975bb9612c27b6dabab7e7b6a5b0cb4bc69a35e90ba818b35e6f79122b9361a7d52793bdf3389d2925942772311337
 MISC metadata.xml 727 BLAKE2B 4ee6dbcec8f8ec7e5fe028344dcad9689e6d4edd1871a4b9f6b28952edafa2dd41df7e03f3a72d3fcf5853a791f7a77a5aa08108d24ae9589e7c0c98b564ddad SHA512 999c1f33f4a25ab6b8e1ede0862e9ad849dd44366236914f2558cc9377336d49989e592973625d9833ad238645e918d7341817e2170ff6a6029b40f7addb775c
diff --git a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
index dd449cff9164..b1c9f93dd000 100644
--- a/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1-r1.ebuild
@@ -177,6 +177,8 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 8394f7f945ea..530596b9a949 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -178,6 +178,8 @@ src_configure() {
 	# Keep things sane
 	strip-flags
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local x
 	echo
 	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 52171919201c..765aede536fa 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -4,5 +4,5 @@ DIST bison-3.8.1.tar.xz 2800372 BLAKE2B 0b70ee1b3ab8075540d9254cffdc1dfc9a9fb354
 DIST bison-3.8.2.tar.xz 2817324 BLAKE2B e211b61494c911f55b72a8b70b5a48cdf4000ce9e675a1f1f52735bb8f57d93a3f8075341451263af9c9c531004907ae2b62b1873e7e4664c2cd26fa3b12271c SHA512 d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444
 EBUILD bison-3.7.6.ebuild 2433 BLAKE2B 0ed0bec877079f60e821b335f829182a23d564111df453066ba7d312c9c943bd944cf095b6c4aeb8756efcf6299fd7e8fcbcdba0befc8b8804d629fc5f21c6d3 SHA512 2ad813a961f85a7f120f95b1a6d37cc217368a660ae763b2fdc1c61c85ba99ca26a92bca932591ea73d7ca69c8ce1902d0d1a3317fd44b30a89cf6f3dacea07e
 EBUILD bison-3.8.1.ebuild 2492 BLAKE2B 9a7c6514cb839e0ed4d86652aeff12b309f80dad54253c2791acd66744cadec894357ac2a106e9fe92dfb0c5fa8f9c749c4c9816e031a822ae8c5e4eb0148796 SHA512 75ef8593d1884d207a7fe5bf82741e5c73d59e4be299afba037ffd741135154734aa6d8c4c4611eddeaaba3bc397052c51326a66949edb82ca15f9336d217102
-EBUILD bison-3.8.2.ebuild 2487 BLAKE2B 54aa13f125444fa2f1e0446a3e7b481504383799476ca1de907d831cd9da32fac47cb2a2bf77e167b22e9cbdd219e0545d1c1689768de2110ed7f6639fe79ce5 SHA512 674f42b7fea825292686e51fcd5be7359fd1523a2c5be2e80cbfe14048b2c17f8c57f31df4f5810fc104f67cb42230ea2840bee98e5338f8a2e721b71babbc84
+EBUILD bison-3.8.2.ebuild 2485 BLAKE2B 54849778fdf2cb4749ce073e2495db77394d537b6cfc488d58fe0f505c8bcc764447c46566be47cb35b6dae099b2fc703388dc4c7cbe5fa075ac478349ba40bb SHA512 352e8a7deb28ceac2e1a04a3563433e0133956fdcdd205add4d666a41c332d89c159fb04c0ac8be4ff67690da47519f0f6cbc25326c6ba63aca54dc0da296a73
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-devel/bison/bison-3.8.2.ebuild b/sys-devel/bison/bison-3.8.2.ebuild
index c351beb7c35c..23f9a168abcd 100644
--- a/sys-devel/bison/bison-3.8.2.ebuild
+++ b/sys-devel/bison/bison-3.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 7c7716ee6680..8204f53caa95 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,8 +5,8 @@ DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03
 EBUILD lld-11.1.0-r1.ebuild 1250 BLAKE2B befcc678c9eda33c73806c12b2c24bb8f3b8c9310303c42ceb87247e9816862f25bab546a5989bbe018f40118283c432c71f895e0b333a27a3e344d570e58102 SHA512 7a2046cc5bef8a7c0889fa6fb0bbf1eeaf776cd446ce3188df6c70898de097c0833e6d9293d4a7dad99fa1d6bf894440920549b6295ed442aa0c560149a71a58
 EBUILD lld-11.1.0.ebuild 1399 BLAKE2B bfa3538e4bd9492e94547f4ed304d75ff5da1e58c1d1a3e044be9da0c77a6ac71fce301ef3e6970cc520cb0c31abd9a81a668998b9c808852b157c91c3e398f4 SHA512 2ae031e69815ad5711567fc0ff5a7aa20d1cd49bb29dadb03f9754bc69da89d309d57996f3a67157be55c87c75cac7ab00ec53deb9b579ed74901c1789f7cf5b
 EBUILD lld-12.0.1.ebuild 1666 BLAKE2B fd1f8a4601c74d8507996e8804663812816c161ebf9351cd2fd262fb3cf1894013b3059800dd856bc0e896af7fc75b381bf353e1d22d43fe36d5859a2086b983 SHA512 6d1ba9cf7ab959da15975b4d1c3117f0a235618bfbf0bb743d73447105ab6672b25e839cadc34415b721c8755eb28abb2ddadb8c4793d3d7f4506f032e4d868b
-EBUILD lld-13.0.0.ebuild 1797 BLAKE2B 4b422a7a9be9a07451617c405d9c5e29542b40b7f668a29ab582fafda439c68a623e1d439742ef0e06eb527efbad70a6c5d3b04b3d5bfa935c26cf10638ba678 SHA512 df93f8813f5e65125e9429e56785af2a98abaf39cc8c285cb4242c4ddefeef1394549e0838a6c123f3dd4ae39edd5b2e1075ab9b13543c904b68c7af53224d64
-EBUILD lld-13.0.1.9999.ebuild 1760 BLAKE2B 038c5d1d0202b4f7e825d3c9b417a402139f8a1b306a125042333ebf29e9aafe2613de9bb7fdf621f9034085ebb741b2e6ec640363315cd901c351105fef8d46 SHA512 21f23f8859be3d16c790ecfb5fdd50232eed0e62620a0c63e171d60bead363890dc6e90e45f9a018459edf51b6a3412670fe72859d401b87dbb098e2deef950e
-EBUILD lld-13.0.1_rc1.ebuild 1760 BLAKE2B 038c5d1d0202b4f7e825d3c9b417a402139f8a1b306a125042333ebf29e9aafe2613de9bb7fdf621f9034085ebb741b2e6ec640363315cd901c351105fef8d46 SHA512 21f23f8859be3d16c790ecfb5fdd50232eed0e62620a0c63e171d60bead363890dc6e90e45f9a018459edf51b6a3412670fe72859d401b87dbb098e2deef950e
-EBUILD lld-14.0.0.9999.ebuild 1760 BLAKE2B 038c5d1d0202b4f7e825d3c9b417a402139f8a1b306a125042333ebf29e9aafe2613de9bb7fdf621f9034085ebb741b2e6ec640363315cd901c351105fef8d46 SHA512 21f23f8859be3d16c790ecfb5fdd50232eed0e62620a0c63e171d60bead363890dc6e90e45f9a018459edf51b6a3412670fe72859d401b87dbb098e2deef950e
+EBUILD lld-13.0.0.ebuild 1871 BLAKE2B 13ea83d64f25df0664fcedd0ebb44dd84ebb8828f0e52b7cd00eafd0d69d1c1d0c27a2da492d8a55ad4b0b39b6569e151ddde250db3cd19bb784bdc4ee1133f7 SHA512 24e2bda650f31508528896c761587a0abeeb061d4e4198449dc50b0794622fd8c87bb8d2d816bf90801dd6914b09e644ed2d3e97cb852f8ad8c005141f5e1bf4
+EBUILD lld-13.0.1.9999.ebuild 1834 BLAKE2B c7b895660913f2ffb83a21bfee7e31a08dca08bcf2515dcd4b2a8fb4e358b14f6fc1bc6a902ed1319c1796a20b54ba902023e5ecb7cd9759cf8e0a63322ae5d7 SHA512 d19cd076098cab1ebf3c24fb7b7957a32c8dbcf0a1d32a837d9ed020e3c45267b844117c0d266a19ce4a725a3196a52f1ce9cb33a5b59c7146c7b215d3a2ee1f
+EBUILD lld-13.0.1_rc1.ebuild 1834 BLAKE2B c7b895660913f2ffb83a21bfee7e31a08dca08bcf2515dcd4b2a8fb4e358b14f6fc1bc6a902ed1319c1796a20b54ba902023e5ecb7cd9759cf8e0a63322ae5d7 SHA512 d19cd076098cab1ebf3c24fb7b7957a32c8dbcf0a1d32a837d9ed020e3c45267b844117c0d266a19ce4a725a3196a52f1ce9cb33a5b59c7146c7b215d3a2ee1f
+EBUILD lld-14.0.0.9999.ebuild 1834 BLAKE2B c7b895660913f2ffb83a21bfee7e31a08dca08bcf2515dcd4b2a8fb4e358b14f6fc1bc6a902ed1319c1796a20b54ba902023e5ecb7cd9759cf8e0a63322ae5d7 SHA512 d19cd076098cab1ebf3c24fb7b7957a32c8dbcf0a1d32a837d9ed020e3c45267b844117c0d266a19ce4a725a3196a52f1ce9cb33a5b59c7146c7b215d3a2ee1f
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/lld/lld-13.0.0.ebuild b/sys-devel/lld/lld-13.0.0.ebuild
index b785c62fae4b..16d9d0874180 100644
--- a/sys-devel/lld/lld-13.0.0.ebuild
+++ b/sys-devel/lld/lld-13.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/lld/lld-13.0.1.9999.ebuild b/sys-devel/lld/lld-13.0.1.9999.ebuild
index 8bcce2b3022a..863c9b49bdb9 100644
--- a/sys-devel/lld/lld-13.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-13.0.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/lld/lld-13.0.1_rc1.ebuild b/sys-devel/lld/lld-13.0.1_rc1.ebuild
index 8bcce2b3022a..863c9b49bdb9 100644
--- a/sys-devel/lld/lld-13.0.1_rc1.ebuild
+++ b/sys-devel/lld/lld-13.0.1_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-devel/lld/lld-14.0.0.9999.ebuild b/sys-devel/lld/lld-14.0.0.9999.ebuild
index 8bcce2b3022a..863c9b49bdb9 100644
--- a/sys-devel/lld/lld-14.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-14.0.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -51,6 +51,8 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_INCLUDE_TESTS=$(usex test)
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 0b4c3333aaca..6e9967e0ed4f 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 136a94069891..04af9e055d71 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -2,6 +2,6 @@ DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc26
 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
 DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
 EBUILD raspberrypi-wifi-ucode-20190114.1_p10.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
-EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2381 BLAKE2B 02a0d76eb634906bc63c6a0fd9b673a2e509d09ae5989f72737c894ac2fa0f93aee9eb061b1284722ed10d6e3961c3c41d7780979ec39c043b0028acbc3f5bcf SHA512 db66def2c415a89e58fd6c2a28e79abe51ce1589978399aa8874fa1d36ec2869cf466edbcc79de2a07c3f77c9c0e96626015b13fc5f4f2c0befaa1e871a7ddac
+EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0
 EBUILD raspberrypi-wifi-ucode-20190114.1_p9.ebuild 2379 BLAKE2B 272d3fabba5110c39f661ad346e9cc9e9b8e174eaa369d4494b90cff6d5e7e5e527ac9f7011108bd35d9659b4a708da87d75240f3146533272c6dc95a1b7d081 SHA512 990db7c7fa97de251b566f8b05aa369c0ae0b9538468870c328c5eb06b1860e94a98b2ffd3a93f462963c75544cf96a7355dbe94514c65ba40d1e1f2d9c8dced
 MISC metadata.xml 601 BLAKE2B cb558331f5bc8c0f398a2734474c8c475925e289b77d00250d53e7683c0a64af1de9185058c72187c727b7accc79c741b688d7ce04d4a50913d6169f0fe0f841 SHA512 7617a620030f5bdbad802806d85f09936097c480106d6beb095d235b347d41dd7a43636ea55e42c11f5c409e2c61c644ee69fe926495a1cd4fe89fd9d1a798c2
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
index cb9800e8cd64..ec573949e197 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p11.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="Broadcom"
 SLOT="0"
-KEYWORDS="~arm ~arm64"
+KEYWORDS="arm arm64"
 
 RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 58c933548d87..c288156e862f 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index 6f908ebc13f6..b5a0d0c5d602 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -1,4 +1,4 @@
 DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
 EBUILD encfs-1.9.5-r1.ebuild 906 BLAKE2B 96405f4508df41529a65d6dee3108312b48adce88e146655e72cd9c0bc947beb337e1a8d967517f87cb245e9d1a41b0eb10907145b24c6fdab59f93826332096 SHA512 cab74b159a9a06ec35d7227798e274e131cb3fdf6a7503117f994df7755881f32c7dcc5f5f697d4fb6b1f8235721cb063c754a63ff12b5eafab75bc92514e1ac
-EBUILD encfs-1.9.5.ebuild 893 BLAKE2B c2d19cc038feb0cca4fa19c8f1bb1aeddd2ca6b1ba14c244e23ebbc07a94d42305418d410a6de2587cf908c385ab9fa8b3d32f931204a5f6e92f12d75067befe SHA512 83726bbfa10744b0260f4a9375ef2fa491c8a4743bc928a2d928ab7686e6e431d9db9c37d5a639c7b70c7583e70d11df05385378f20b9eafdfd06afb32ef73ba
+EBUILD encfs-1.9.5-r2.ebuild 1010 BLAKE2B 3bb2706a1b91551975df08e9cd67e77399be8c17cc089446b2649b506bd7146d2cfe05d44c5bfb32eee2d06d20a7c0efce0dbc0380a04f771a6e94e384beb3e1 SHA512 4f4cba74dc38bdd0d480e67214a1075f8ba1aa0ce16c3666c0811209661b56416a359b47525f708d704408c8fabb727db1493939b8e10712bb86585435653cb0
 MISC metadata.xml 380 BLAKE2B c65338452c25318cbb3f5d2036753661d3c2ac246269f49e5cc51781d5ce0ed2edfb37b74dc53cebddc249b8e0ebf0fc01d5767b70bcc628c8b3254083f36071 SHA512 104847da4091bb323a2ea7f1129cf18d6893ecb000b0ce2d11c09bc8ce7da623dc24312b30bae75b03c7908613f83ecf1ecf88ff5c285ea34a170238e5f6c700
diff --git a/sys-fs/encfs/encfs-1.9.5.ebuild b/sys-fs/encfs/encfs-1.9.5-r2.ebuild
similarity index 68%
rename from sys-fs/encfs/encfs-1.9.5.ebuild
rename to sys-fs/encfs/encfs-1.9.5-r2.ebuild
index 70d05c10d13e..c26268474a9d 100644
--- a/sys-fs/encfs/encfs-1.9.5.ebuild
+++ b/sys-fs/encfs/encfs-1.9.5-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit cmake-utils
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
 HOMEPAGE="https://vgough.github.io/encfs/"
@@ -10,23 +11,22 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
 IUSE="nls"
 
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/tinyxml2:0=
-	sys-fs/fuse:=
+RDEPEND="dev-libs/openssl:=
+	dev-libs/tinyxml2:=
+	sys-fs/fuse:0=
 	sys-libs/zlib"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 # Build dir is hardcoded in test suite, but we restrict them
 # because they can lead to false negatives, bug #630486
 RESTRICT="test"
+
 BUILD_DIR="${S}/build"
 
 src_configure() {
@@ -34,6 +34,10 @@ src_configure() {
 		-DENABLE_NLS="$(usex nls)"
 		-DUSE_INTERNAL_TINYXML=OFF
 		-DBUILD_UNIT_TESTS=OFF
+		-DBUILD_SHARED_LIBS=ON
+		# Needed with BUILD_SHARED_LIBS=ON
+		-DINSTALL_LIBENCFS=ON
+		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 07867d8a6262..0f330da4ed86 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -6,5 +6,5 @@ AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
 DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd
 EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805
-EBUILD multipath-tools-0.8.7.ebuild 2133 BLAKE2B 84c83f537814230e887945118972bacd1d394fb2fbfd30a7b04ab726bd0a4f835ba96d41b145cde2135c094999772702f33449a763c74fc6e95f059d7ece2b59 SHA512 4c85ac3ab5629f1e7a5945ab3ee0bcd33d8f46034c23aeaff7a6bdba994feb81e0a7fa939536d8b772e207e4d5b2e1bcf86127f5564d773412e4189d07a441fd
+EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904
 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
index 8e27d72203e6..35caf3b69f5b 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index e4e4d1e0dcc0..4a19d9486874 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
 DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42
 DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
 EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
-EBUILD udisks-2.9.4.ebuild 3651 BLAKE2B 9bd2e0bbc5449c533483d9c8742a18c1180d5fb52af8f3f9b3db83d01e0aca743c2f1a349078f2899efb5b18595aebe2048d932f8a436f379370bd55bafb0fe1 SHA512 7c31ae3f7f7c3c6974994ecc00e62879091791cceb48fb107db2324ee5dbfa4f6da0eb81b999939edf5a0bfdedab671c87f59ba0ef3dcbacfa5beff69c3d7f0b
+EBUILD udisks-2.9.4.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a
 MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671
diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild
index 8468ca383ef5..3112d930e977 100644
--- a/sys-fs/udisks/udisks-2.9.4.ebuild
+++ b/sys-fs/udisks/udisks-2.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
 
 REQUIRED_USE="
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index fc6c294a3c2f..908c41183b6f 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,9 +1,9 @@
 AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
-DIST xfsprogs-5.14.0.tar.xz 1307332 BLAKE2B d2177f10d677e28439cef1db3ca6a2adb93f89f1f415b2b564ec694d80a0b981ebd283d33ea21573ce2e7405da8235bad48df3ca43d37a4294de60ca95380ed1 SHA512 dc87840c05bbd3f6ba64bb61f95499d58eff1d4bb2309ed223048ca0e475f5bb139f03c47f415a997576e5bf85cf06b1a040e022397d6f0bcd5ba60b36d8b0a2
 DIST xfsprogs-5.14.1.tar.xz 1308968 BLAKE2B fda20f824a030113717cc46de1920696dc8f9eed13b54809e6b21275cf4f8673385e8bbb1c1c668ba2592ab43fb230c9d46edf4c0e5abe59a9572cc9a90ae5da SHA512 5bb79fff45048bebee2fde85ec788658dd8dc8d5ddac222b1f74c6cd525e1239d920814e8e713f045e38398a785321bf0a7421ff1c690cd0be5dbb224f8dafea
+DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e
 EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431
-EBUILD xfsprogs-5.14.0.ebuild 2298 BLAKE2B f62894f6091ed43dda4817ff2259b02c544acbca123de22fbe89504f0e4805db0c4589369b24da35218b075f11d0b47313d9859df34ab45f6c187bbb178d299a SHA512 6612895c549b250197061517c54b69ad57a5c4fabce96b1d917e71804a5dfc3d0aab5431d1414dff6784a30c1eb936d387e39cfc80cad4e8e6b3e414ce78318b
 EBUILD xfsprogs-5.14.1.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb
+EBUILD xfsprogs-5.14.2.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild
similarity index 97%
rename from sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild
rename to sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild
index 069e9cb903a7..f1ec2e50d05c 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.14.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+inherit flag-o-matic systemd usr-ldscript
 
 DESCRIPTION="xfs filesystem utilities"
 HOMEPAGE="https://xfs.wiki.kernel.org/"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1eeba50e1009..8a417ce1e761 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 9c774c543773..87b25ddbf313 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -8,5 +8,5 @@ DIST freeipmi-1.6.7.tar.gz 3419196 BLAKE2B 6e07afb7e93ec41c18c82725e781177d8a5fe
 DIST freeipmi-1.6.8.tar.gz 3426706 BLAKE2B afe3238955786b13aae0e0062028f5c969a8e686b46bea3850696361355b3bd82a55bd93523ea7fe2223fe5bb04922c26b46023f783bd879bbd01e34ffd6d59e SHA512 66cae2aed95ddb3fd9301146d5a1065b61267232d6ced726b106402bf3840a17364a29d7bf6bbe4db7955b77dcd23510f1258aac85ead5c295c876c6fa4333c3
 EBUILD freeipmi-1.5.7.ebuild 2344 BLAKE2B 7329bb06a60524102ce6840ed5dfe32034595b84d46fcffc053c7ab94b0f8076259905bfc4aff90161d24720bcfc51e7c1b7bbcb5087d75f4ba9ca73dc8e1e1a SHA512 01db52e96fb2e0e5c599ee235a4c8693242d086298fcee903c43f8708e0afca77fd480ecde02a3b14ee0dd44826334272ecf901f4a6a7b95a78cd74355f44bac
 EBUILD freeipmi-1.6.7.ebuild 2427 BLAKE2B 260fb05d6e2a0ac544b13038e7dcf67a4281334194cc797ca1e9e38befc20f813ff8ba4c19a85b70f918685f33ef6fe681f40c60983c22f754a34e84aa68042d SHA512 fd127efe81afb6913604de4db0e0c670ca09307fb5fd02f8cc2039e6825135e2af579436a785722021272fb7fc341a3954bbfda6f11e6ebf7b7ea5b5125b099a
-EBUILD freeipmi-1.6.8.ebuild 2457 BLAKE2B c17f97bad789a8304589cb4a55d93df823e7e3f8d7ab2696e2d52672062f653e27b46976d8fe0451384d00dc0a40491467a9e480856d391c630b0ad0b71f9fc6 SHA512 6c437c4a4ea2ccb7ac919d1c63b1e56a67c128a3c26a7c67ae3b25811b61e2e3e6ef88fc84516223538de835d077ea3e5eb99bd030309040120973bd18450866
+EBUILD freeipmi-1.6.8.ebuild 2455 BLAKE2B d7205e7af550c7b7ce3856532dc28f59fcbf8bfbd8c5067afa021c12c030c5585530d7de399d681af00611b11a331f529592949a3c31575ab3a0e6fb55e80872 SHA512 f8ff6f69ddb3fd2b1fcf0f431bbb4b84107903e6edf79224d28fb815f915e753f9e65241d65c924aab59faeb878e500e3a78115729f22953b130967263616533
 MISC metadata.xml 377 BLAKE2B 0c5f5f13dcdf90731feddde774186ffdd9744cbc903f43a2599d84ea19f4da93a28d1d951d15c2c268449b448d1862e0117424411a259f872739f9baa4b937ff SHA512 927dbcae26c2c6576da5e606883a98049085138e6955b3a3ef82826216521848d08a2c505d0583b9a337190f18899a805f7174bdfa46f81a099ec68761a1ce91
diff --git a/sys-libs/freeipmi/freeipmi-1.6.8.ebuild b/sys-libs/freeipmi/freeipmi-1.6.8.ebuild
index ab2cfb4f4640..c822176742c9 100644
--- a/sys-libs/freeipmi/freeipmi-1.6.8.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ~ppc64 x86"
 IUSE="debug nagios"
 
 RDEPEND="dev-libs/libgcrypt:0="
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index fdc8a075b0ed..b54fbe8b1eb7 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index ed55f1855115..fbee6b85bdf3 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -5,5 +5,5 @@ DIST lmon16m.c 268614 BLAKE2B 8705a890cfc5f02079d70ab9de8e1462552342a16e57609649
 EBUILD nmon-16g.ebuild 958 BLAKE2B 5086bd2d5d81c935022974c242b9de9fcb5126bb5f5d3dcd623ab3ae8908b02db09fe624fc5bfe7a566cec1eb8e0eb03c9c973615180705a7b5896bb558bf22a SHA512 996feff8baa7889310cc148de7401416aecedbeee6f445afb873aee96435e00f5dbcfdb69580882da58dbc7184a6990c92d6910610fc6e981a360587c728f8e3
 EBUILD nmon-16i.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
 EBUILD nmon-16j.ebuild 975 BLAKE2B 16379dca3964be32acdb9ff417607183eee128c7c5b2677cbe3ec581522f60577220004fe2da6ed13910eb2b51fd73e8c0f518a8d8f0b543d36d5cde1a187288 SHA512 1787a9fe96a4b24024bf6c1cc53f4a3001b8cbdbafe8b554ab2c31b4d1fb72252ae33c46f52d74e8a57eff7f20bd76522f0b1044425ff8495946caa3267b6415
-EBUILD nmon-16m.ebuild 981 BLAKE2B f2b1006b5565c62ac7e05700b6cb600d2461f5181bfb0567cc4299fb5f55280ced58291bfeb33f664f0f6da173b590256000dcd4133f51b01bcd6441bec6c809 SHA512 82a939265f7e60db676f6e668202c502038b05a682cadcb03602706c2b10867932d9c031a08d6fe0d90a1bcf422bf8bf13a0202d8ce10e1bdc9fc41b96e250a6
+EBUILD nmon-16m.ebuild 980 BLAKE2B e2a51e7403989395a433cd85b13c388e49526a4e5fc2dc491ee1cd88f7166f0b25975dc62de242e5fe5759c2cda21591f7520a7eeabb17891363bfe0d33686c2 SHA512 07adf3f3c84473f5f45334d38818ac90ce8076a6d1eb9e93c46f29f13de2ff8b00a2930c1570e694e501d62e02a8fdab6c61ede8d4dc291601c5df891deebf28
 MISC metadata.xml 242 BLAKE2B 1dd26f07fdb13f53ab2af6aaff6c6f4ad675e9424088170eecaaceefd70d5f8e52b5849b97cb705c79cdeab723675bdc2a612b12ac5b1cec450dca47d170f344 SHA512 f910e0e91bee857d0b614384727e19b98e5743b1c55ae7fcd404a261670572429ee632dd91eb8156b656596f2d2b98f3a6fcf3f30c3db5666c8b14d36198b65c
diff --git a/sys-process/nmon/nmon-16m.ebuild b/sys-process/nmon/nmon-16m.ebuild
index a534b4293282..7fe503fa0388 100644
--- a/sys-process/nmon/nmon-16m.ebuild
+++ b/sys-process/nmon/nmon-16m.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8144426f21b2..48f1f25cc3ae 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index fd819e6d73ec..4df4344c9bc4 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -5,6 +5,6 @@ DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a5
 DIST dillo-3.1_pre20181005.tar.xz 907752 BLAKE2B a894583e2c50baf2c2ff615dadfbe79e7652154cc0f7b80a4253d27dbe2e5463fa9c7a44622a6cfdcc60822cee0e1c38c31231b5bc5ee9c7b22bb16a15cc8c90 SHA512 f1916c6261bfcae9264037eaee37497660e43e46641c42fbcc9c2592fa41602a83fc91ddce6aeabc0122c575bcff72339d181210f3039e5d4c5a7c25f88aa642
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
 EBUILD dillo-3.0.5-r3.ebuild 1241 BLAKE2B f304a6f6e61613f97fae92370271a09a43bfa195f913f8d5694e14136adf87129e29616a1a463eee49989a45cbbbf3885653e190dd8394ca83feb51d4553a685 SHA512 956089c7456747bf4f12da512233853d2c9180897aacd5b262089fc86a7aa9e7b6aa16621f7d5c094a13b4081521258a85904b19873a166b4f18df37685b6e4a
-EBUILD dillo-3.1_pre20181005.ebuild 1224 BLAKE2B e0b427f4542b1ca32f98c7bb3b1bef6c4cc105421e4a7bcf143ddd98730fc9d3d11f571be847b1bca886b3482c5c2a3822351796ee8493b69f079f2022c213dc SHA512 1ec611109007cd11a7bf2e72b578293f883a1760baac363378b2bd12237cc3a6c21ce1a8d00a93af7b7c3c20eca006a2544a5ebfb644dc62eaeb741be3aa5a3f
+EBUILD dillo-3.1_pre20181005.ebuild 1221 BLAKE2B 328f9d76632c35f4fe8ebfaed11b0d1467b7fd73b4803ba73b3679339a99c2b5e012ee51522dde4aba69bf5d8724fb959e0aeb3172fd33b2ac37b936690a0c45 SHA512 cf574cbcf8ea961cc26e2d0bdef194d53c859e5597e6cfed331c611b05279323b3e0defe9faafd75f82b911bdf3d5f3ce94d3fc82d012806005c6e140aecdeac
 EBUILD dillo-9999.ebuild 1153 BLAKE2B 8c859ca6a5d600ef275efcf30cc36352ef7b761d6971dea299cd45e19c209ccde9402e41652a6f79b7913952d8bd88b9d8b3df49e40277c46d45299be4f90468 SHA512 695e0cac6fb25b75055d8c19a77e14d5c4c6dada6af22ab0904fe43d93b96bf1c1550c170385a0a2c1243b40d0e57ea68088069025bf9d60ebc2780eb5acfbfe
 MISC metadata.xml 234 BLAKE2B 005eb7a48b02fc940cbb0a6295ff7f2af850eeeb2d96ee4c72782c8fb23a3b95d6219536fa2ec47be79553cd2a396a909cd5779526e33faf1d1669aab442a809 SHA512 3f8ddc377f27647b83b0bad68cd3daadcc3a9021c28e05fa32765103d53f0c164436c5265ba4373345fd0fc35db8edc3a5fb2c03884a2a22b14f5086e375206b
diff --git a/www-client/dillo/dillo-3.1_pre20181005.ebuild b/www-client/dillo/dillo-3.1_pre20181005.ebuild
index 72b27e82e6d2..d1aaa5bcf4c3 100644
--- a/www-client/dillo/dillo-3.1_pre20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_pre20181005.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 7c3241dea452..34278a0aa4da 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -198,6 +198,101 @@ DIST firefox-91.3.0esr-vi.xpi 581328 BLAKE2B 596dd95b4a8573c4d0dc0434be2ee5eff4a
 DIST firefox-91.3.0esr-xh.xpi 435358 BLAKE2B 96c7c7f452184145ef154126b6c2fe6216faa90b62267a0946871951547c13d86612066696549b06b99a0776a88911b26432758e9b32cb73715a73d415e82c2b SHA512 6cc4acd79aabf3f062811578bd4ec98a26520fd05af7c878fe3fec699fdc86da760332fac5c0a6d814abfa1fb2919ed869ef8f0dc5b1c5f0b582dfee4f0bbd74
 DIST firefox-91.3.0esr-zh-CN.xpi 583248 BLAKE2B 3caf831df6288ec5c1025f20c1834b6993fb5f50349d9b8715e6e020ebe5e1dcb0bf62592f800e03066cf1564a8bcfe0cddc8e90f72f6d7e3298e1ecc97c71b3 SHA512 95044ccbd6ef200deec8e4d3143a3989277fa309182248d8bf3941c25778841243f525410c391d49aee33a6bfc9d6d625ea45ce96ab7df9e2d70264ce1a3a438
 DIST firefox-91.3.0esr-zh-TW.xpi 583430 BLAKE2B 848ba2ff85a16105153a1810594ec9c76f4376aed110a896cb2de21b8a98574ed6d8ef1b5b290a2c650cac072e4bc7420405263595225170d51682fd5a0b8fd3 SHA512 0d4ab413bda98207f76d4b8ff5f895dbe2e42e67856a93027de18175927e24f7b3d1eb4beb6c1902f2dbd6bdd4e6e3ac164a7a1061de77acd43331b1dbc1d68a
+DIST firefox-91.4.0esr-ach.xpi 451228 BLAKE2B 525aac7e80d504b87a565f045f6ffefb5b8743d9f0606564d6c10dd2ba6ede526d451bd08bdf9ff4abea578f55cbf7dde1c0542ff8ac3640c3c8bda920d146fb SHA512 42be3bdc43b561b2148fcc08be8c4645c6ec15ebc1d689489f922c31234df2a88fa1dd481b7d8122c822b8487e2d1cd4e7a546909000603cc1d056afa83ff5e5
+DIST firefox-91.4.0esr-af.xpi 425096 BLAKE2B 8af222eee5d909eeaa76168a1601e59abf870e1d351b49495074c27eb12e1fe1160293aaa972633002a9e9bdae02a555e395f962de8fd9283ce86556ac73d6de SHA512 1a82f635d36a646973b0f08b1746bd476283f6e807ac31ef9fef48e59130367c7e138ba92038f7f2778c8f4455f9d6726871bbb9d563495b68b0e3f72cf1bd02
+DIST firefox-91.4.0esr-an.xpi 497865 BLAKE2B c4903662ae08d04a5193f4355ab273d09b71fefe3ed69f93ee80b577ea76ca0ff1921f31c8d4de852569a41d6eef54ae039d6557437761fce42d5c7babc632b9 SHA512 35da11f247f7180e2c5e720a1989d57bf575c7c8844b231c38b598c0df166891b9fbc86360fe7865908eee7f4119c037664f74002093a056e601fc65634361cb
+DIST firefox-91.4.0esr-ar.xpi 557243 BLAKE2B e1f4dd28e26227ef345673ac6b69eccbb3083d619fe0ad691586f2c132912589552e3a2d463efae30ac109d3bcef7a2b94aba78b0dd89b4a1ddec9537adb2e14 SHA512 cc5e9e60cc65314fef7c6b001a773f8ae7763342ba2979606dc4ef3efeab2af5cfe0443c953dd0796a2cc4f5bcd4671a6223fb921559d455794ac3c2606751fd
+DIST firefox-91.4.0esr-ast.xpi 496964 BLAKE2B 6cd56181f48260dc85982220d32599c5d99fc7607ee17cf607976d945b8fc04217e9bb5ed150db6e8b0d691c6d219f9adbe9e26fc52af8af106b1b635caec105 SHA512 619f8f5d96d325a068cd27589de9cf230be74b613d8cb983e4833cfc59641b5e716a3d7f1ea69027e1baea4ab5a34f21f836141e5bfc4d8257c8d81077c29804
+DIST firefox-91.4.0esr-az.xpi 487259 BLAKE2B 533a12abce11c5d39eb21291aae74efe0ca1a77a2169ce5be11cc64864b1cda5b28f04153c1f0c1c368b5183b248aca9596fc0c8e19466a5dc433ea5a54cdd54 SHA512 ea239697a214b6756e091655608514f3746a6ac0661cabe0241004d90854baf7d0f3191de361216dec70db00534bdd432495fc45531c1ba1162bf61d35ad4e5f
+DIST firefox-91.4.0esr-be.xpi 617852 BLAKE2B 0e9fa980b3bc459e3b9bb7f3e63c6c3b21a2ae30995412b62dd55d2865c5e8144d5bb236a884680839a227e2e5456b107cb4c39ef1220b6186ab8ed8649eb170 SHA512 848d39d99f72bdc0b470c9e0a9a347edc3a661a43342e68085c33974bbac0d7085548fadb391fa4eec12aa24d4e577e670899d503a70bcbd02d83032b4d6c8b3
+DIST firefox-91.4.0esr-bg.xpi 566071 BLAKE2B ce4def1ff088bba14618de255e33dcafe2c0e1116f5d58166361f1f8a27a7c608e5ebead3270766111598c2d43ce5a9b413798c4aa722960bcbd7da07386538f SHA512 e964a9ca742de974334b5f9a54dc3a0e6d7488a181ae7696a6130e2307d85cf1d39307ee4442bc663dab7a9a4d1850117a5eaac22e670852cedde4a18d2e0c46
+DIST firefox-91.4.0esr-bn.xpi 554437 BLAKE2B f0b7e820e5a06f9ba829fe61b903d8d363eb4793f8ba7463096ea9acd68abab500465c52ca9d577fda0b9f36eefcbdf62a4811be15abe9e2ed3af752853c5980 SHA512 95bed68b2e1c2954a8447cf5d782c9e650bd06e522163341890aa7e751ebd906404dfa8fa68e66749c0a69e5a1a17fabec827ecc0fac2bcd3db5ed4cb423346f
+DIST firefox-91.4.0esr-br.xpi 522501 BLAKE2B b2b2e43d3d6a0dce53b8fa6329951bb3ae14513a53f42078545c1bac0b42ed3854e367bfa9ddeeabea995c6f0c2709150dfeae474b6c9d22465057ae2c6cfbd1 SHA512 f4a4a21ccb7b7609dd7050f5fac57834b3806916ae2fe5a8d46dfea43715a80387ae776edc84cd151b2913ba0b3250896b2e0667dbcde5501873512a9897db26
+DIST firefox-91.4.0esr-bs.xpi 461651 BLAKE2B 173ae71acf7d349526871b71a17742723d5ec4ca8a4e4786c7e60611579aa1dc2d7d3aa98db263a0d6e3e9246b45fb1f923662691df5c0e7b9bf4119abb3bc5a SHA512 98227011b4167c3635507c1d3984854e049bc12f7d9ac27678bcc8c3db2c00df461d1b937c30e0ccade7fb90cff10ca354be84050f63730b05e6261bedc18c5e
+DIST firefox-91.4.0esr-ca-valencia.xpi 527261 BLAKE2B 08da181d15b6859851f294a97548685797e6de5a954615990bae0fb0de0f8a8af4267516397e7773e6d239734c12dfeb5c3597ed66e917cdd35b7ee929a27522 SHA512 e91197cff0a966fa294f9e7027eff1134b196489ff5ccf943f3c91a0deccc60a9b4acd02e932074196e5fcaf3702453058aca1f5efe57766d44cd21a7ea35082
+DIST firefox-91.4.0esr-ca.xpi 527631 BLAKE2B d759ba35fe9940a21ac969b9386f236ada30b5ea4ccfa702714de5aa2310a150db48a2dc5e2c46087e4d0d2abb51e60672eba9b9e8e941d3c33d2529328c13eb SHA512 2abef3037ba8d26669d64c710acb681136794e9d51c47f25dcc8d668e8cae65b708b072569379d6c272a54ba6027212696ac31777d79421eca3acd0fcbc75b91
+DIST firefox-91.4.0esr-cak.xpi 550924 BLAKE2B d41287e5d63273e97ba55748d6f94462db7fd0508be4bff7d59c7e79504f7f173826b891e52355545edc9110619755ab5b8bc635e65d2019d012df7185fba24c SHA512 86b021881ebc4bb1855cfc52509b16f864314947d7122da415ce057dc7daf7a3d4aa9621ed668152302f9eda1250c7426a8df9a717d92f7d1591097c4aea6c55
+DIST firefox-91.4.0esr-cs.xpi 559274 BLAKE2B a8e0f05e08b85020a70ba313ec16a4cdbe2e1815070449485bde0436750e42ca39bb1d2b530cf4c69928ac96a37f24868ad5dd09182c627ba8916cfb1eece052 SHA512 2a706df50f8245863b9d66265055c83ebe2fd8e19e2ec7f203aff4036025411a7c9163cf60b6f37e042d3f11cb5b4b3de920de2b26db9559525339261212201b
+DIST firefox-91.4.0esr-cy.xpi 538234 BLAKE2B dbc2747859d76eb542c30719364963b112e0643592ea6ebab75167eaa5db5f5c62427d601c3bd2106001965e988b098191b2c53b7be1a8237dbe3375aeb56e91 SHA512 3a4fa4f2a52bf028ba8b2bf370eea3ae0a0a50fe98e42eae8eed8aa0d5c828aabbf72b21a70dc99ccef3b6ce59956e01a0970b44bc9cd82cf3f7d30f48f9a898
+DIST firefox-91.4.0esr-da.xpi 530228 BLAKE2B ad7891974d63bef156efea37a634a53548fc924590c7caddc4df1aad12541f2052123aff1656064e38743764a6c5933b968ae750831dc5b7686f42cdc64cb7d2 SHA512 1feafd2c5af269318109e11f47bd1dc30c28027b02deeb2910c21e84ca988c0ef6e5b85adead7aa73581bcdc861445899996e61b370a039355bf15d63ea3309f
+DIST firefox-91.4.0esr-de.xpi 549363 BLAKE2B 8660c7d0d22382487bf45d573f93424706b07b4275e553e00faab26debaa156309918983b18ba60710b5694da7628c8bad89a92709f67303f63fb4974cf32143 SHA512 badfc5b13084cb6938a08e403fafbe128fe62f3eb799754b89037204f72a254601073d46b10d614f120ee9ae834cbac63ef6d2b2e632a1dbd29d8ba466f6a00e
+DIST firefox-91.4.0esr-dsb.xpi 562054 BLAKE2B 03ceae4f7c0b21a4a73ede81da1d87f28b36691ecfade984e0150367faec8397ebad2a53b5709105afd437fbc84da1673259993cf9c95c415a962db827a96a9e SHA512 bf46da14c7539d4e69a2a4ae9e11949b9013798587ed99d15831ba8e654d1d623dcbd26150668839b06196e24999b7ff6cc8f31c0c664b6d338e8423b813a26b
+DIST firefox-91.4.0esr-el.xpi 634551 BLAKE2B 4d6d237e1657db12df1d13887d45c636e0fbadc79feb9c27a16243bd6157c5b7f7d0c1b1cf29e05d58709c228929c0a4d2c4732d4c1d0f844f11606c50243494 SHA512 433003408c24815a5e05e0595a21fb6b5f1710cd672b343f9a708299e8c61f621d0b01cd9895610fd87214b6108ccbe9efbf8053a687b669d60864f69c45b2df
+DIST firefox-91.4.0esr-en-CA.xpi 506461 BLAKE2B 499bccc90ee2ccaf44fd82292ef193223b8ce0a8ee8714694d668fc52a1e550dcd90d75455810a3f167d50060decd5d491660f4958847872f30211477fc53329 SHA512 79db782768da33dbdf707d8e67d0fa361fd7651576b7fce5ba55fcea9d5b36b20961eb5564ca9f54dbf5dd8d21f8b106d1b7fcbe7b6e6c4704d54f9c0190e579
+DIST firefox-91.4.0esr-en-GB.xpi 507019 BLAKE2B e1143c3c00e0ec03be030b12b9988b7ad088fe2c833524b796ad4ad4e0a2e10d1754b217dc8e2bf280b1dd92a4a8f9cee9fb55875b6540847591827a0f687e99 SHA512 53cf821d5413f60c13e50cdaf9244b80c4f4783cd6bfe7c7c340b99c0d4f1f479950affcabca33db1d28da3302e30b157e78e972384b1d56eba06043c06d6d64
+DIST firefox-91.4.0esr-eo.xpi 528486 BLAKE2B e5c361e4c4fdee20d33ece92d5130f182a5af860d916040463e8292f14799bda0ced5da3cdd09844a85799e5991d9f25721e60c4a8e9b0321028d2f25a26085c SHA512 4c93457f3276f66d442321454d9ee020ab24966552ceafa980212638379a15da213f9bd08dfacab104803ab1258f3e3fa92c6f4a81548c7ee973871151900175
+DIST firefox-91.4.0esr-es-AR.xpi 542781 BLAKE2B 661c003673dddce5ca3cbddaf6a7166f65ddbd62eccfda55fd6e110ce2ee416d48a2be1522bd298e64c54aba72c8e0b55c233a5da46551970b1553c78911142a SHA512 cd7d4c39b4b010dd8c17497450297b7c3f8ccbbad1bc5b598700b88e4432c8c6a4c07652fe4f818b6c58028fa243bbfd987436ea9749303fe6e33da5756c68d6
+DIST firefox-91.4.0esr-es-CL.xpi 542423 BLAKE2B f620a3f923167105b6222f4f814bd16a3d39c791e91a034c10c4e2a74e82231ef11f967d4d10b74a51de965825b3d95213c0a4044d500e0825c22c74def52b7f SHA512 1df5c356c657bf009c0702d178c0a97ca6425350aefe46246d585bc914f9e957d45be2b8f098c79aeb6802c715879faa3c9ebda96ce1a1855151d0f031ff9c27
+DIST firefox-91.4.0esr-es-ES.xpi 533117 BLAKE2B 645808f4c09423f43cd323eaf5190259702fcabc29aa816a3eb64e63394b5571e0c4e23a87a5feb9e79145fc3d2dc6c4e48d12fa2f0df199690f8245aae877fb SHA512 4920c49813d2b996ca832f452d51226365bb39a44ac62645e3418749fbdd08e8e5ec8091eb9108e9039206d434091be570aa71cbb9732516752cf616b4465dc5
+DIST firefox-91.4.0esr-es-MX.xpi 541516 BLAKE2B 457044739b4f864c7c5647056c4b31eacb32d79296488668429683a33f7a4438b13a8832763f9e7628ae6094d8b7dd1ac72944d931e96a0e4a1a6883d5cd8878 SHA512 79b184125aae7311195d268af0d97aa274c9d26d8fd1d8b557db9860dd8e5cb17a5307a39a22be150fec18adc69649dae5e76922e9c46fe29cb32a6bfef8b46b
+DIST firefox-91.4.0esr-et.xpi 480346 BLAKE2B 5ac5375095f433be0d2d474c7ea808f826c2123b82ebdbd541bd03914972b4546c940f1334711ff16c75b9d07ef179bdecef8aba80b02c0350c4696d86655530 SHA512 d86bee23f2a22a09b8cd331a3f1ba3a17a3509c1941af64111d604895e8ae48c0ed36daaa72610037aacd039d2e1ae80a08182014163cb054a57bb4bd3c99029
+DIST firefox-91.4.0esr-eu.xpi 532520 BLAKE2B 88fce18bde87ac875adfb43fa5741ba2ff568f0ce8c1260c474d3f3a7af879ef4af699ee8a6b24d99aa6228dacca67b7897e9588f2b4c30679fe37bfcd511693 SHA512 c1cbafc7a7f2c462d7c2f43b830397dd02f9b6e12c01e45be154105b36cb62e56d18f662086dbe4127d91927dd5980157dc90dd4a8bbae8a663beb42dacc7a47
+DIST firefox-91.4.0esr-fa.xpi 553970 BLAKE2B 568cf1029ad7150c72f06adbdc80ce16235f6905fdd7545ab9aa8b5923b5f585f2e2d889260b5ee3cb30f6a0dfcbc24afc5b2e7307055dc4bfb02e735e40d640 SHA512 6c0d5114943d27b4d8b50a99235d6e85e6674a810e95c1999cd2061cdb9a7f1f63444857fe69d893a864a3f083ecd86fc4641d59edb9b15ec6f1287feb2a13ff
+DIST firefox-91.4.0esr-ff.xpi 469973 BLAKE2B 6dcbacee6086dec58fc2b619004cd505eecfb20ac914b2592c6e18864b4c016b535949241f1e8e806ef7609a3534c272b0339a701ca07fe92aa5e0fa2c7bf8e9 SHA512 3250d9e7c14370ad5379b081dfc4831ec5c4db6361cee3014f1c31d0b963d82da8cc5895ee8793d383fc508e0d78fb289f592f8dc1f75e1e70b61ffb6218111e
+DIST firefox-91.4.0esr-fi.xpi 526622 BLAKE2B b77cbdf5370e3535a3352cb956eac60f2f3facaa6f9934d6bd75d8570b0bac801a9f56cb44044974b9669595c54dbed95e48568759cfaf0f853f8fd89fc3b91b SHA512 38d6d9d1243ff26fc588b984114f8669136ac7e78e421d1dec0ea6bd12116ae49d85de5f3b559f21b0510c01a203cb8acc19f625047e13fd5d79238832a2af94
+DIST firefox-91.4.0esr-fr.xpi 553503 BLAKE2B 393c700caec3ccee3ca5e679f63b8463461750872c54090d5f619501ae4dadf0a475ca47da1dd7efd80335854b094d52f08df7ec4939a3978b7130ef8875c840 SHA512 fef38c360e58008da3ecfb261fc8cfc904fb4512159d4367e7e3d08173c1e675d2fd9a5ee0db5cf440f2eae18314998515a0fa1e78c855ec2b45cc95f70376fb
+DIST firefox-91.4.0esr-fy-NL.xpi 539366 BLAKE2B 618c96d6156799c5744d311368d7b29edb79887c6997260bdf74bc3ba6b6452ce7fa76265965e78732bd746dc19bf1512e7ddd9edd43dda9faa6166417cf6274 SHA512 062d45aa56fda9e7e77d0badde5a519190fdc804dee5d648d9d2ea75174ec6412395784992b50ac58e79d821492b248e6757f2c99c63a5649bd5bc52de74973a
+DIST firefox-91.4.0esr-ga-IE.xpi 457892 BLAKE2B f3f5c1ea1c1e122a896bf88774f8b76b8dfe48183c8896f5c64c705dc1ff0283a2f17b534301f4dbe2b621b5f6f6251d2085b28476ff21aeadc1cd15d9a14378 SHA512 e5aeb011f6e6b5adea4c04b01f994a6d4e3b4d368fd8a1efefd48fb631fca757463a71f2c3b519af7216ef42d540367fae3423e6e2dea038e51075c10b4c7b33
+DIST firefox-91.4.0esr-gd.xpi 529204 BLAKE2B 2d61fd5f3c221dc9ccf9a72948d28a9615c6d920989ede46ff888bd0f63754eef7db995d3744be398249db8aa7bec0d37f61c58ea1de016d4ccbb62b471ac58c SHA512 62222ade8a1ab7a60168040c25929155f5e9a6a769d40885b7f6471bfdd523457e09cd4810227dee5dc97092fe2862a66af62843a18a17be8cd0cb4d09116e6b
+DIST firefox-91.4.0esr-gl.xpi 537265 BLAKE2B f3913d321f6abea828a18f774e475da4d9d91bebe3e596a77719216ffbef7602a10c4501d0fa6c1ca1404c1121773a9cc2b4d8b1c02e20d971ea1516a05fec3f SHA512 1f3177618c182cec06c9c9d69efb016dd09ca80dcd1a809a5308c32e32737a3c18170de3f9f88b04f71a42b2090051c6c62f8578ad55488c5322e9667a0b1301
+DIST firefox-91.4.0esr-gn.xpi 554090 BLAKE2B 216907423db0a9ea6af0003cda1fa12b6b44fbfbaca7b71d241e9e05365e07ac99b2b2d8654937a840b4747a2916228edb9e66a56203e3b19e8fc4fc41daef6b SHA512 306e3474f30cd22e52e17a7f338f1ce28b2aa03cc8129eda8b24cf379d686068bc93cfe9c3cbbddf4e60fcb278a5c0c9cfa443fd4f34bd4b6bff3f924a6cee1c
+DIST firefox-91.4.0esr-gu-IN.xpi 527245 BLAKE2B 2dc7bff6a9a8117907aa0534100cda919926191793171b0e35dda3e3e0c66d7768ad77b24266de265b5a3dfca206d6c3f968870b2184badb71d99c1b0ab9e650 SHA512 ff631f7094c1d3d496a18bfc9279424f8165f2d3c0e9eb40a723e1f586e32602d9cd387cc4eadd6bb0e7a80996b94e5e9a774e4f2b010427cd26efcacd4fa947
+DIST firefox-91.4.0esr-he.xpi 553037 BLAKE2B 3700b0298b76cceef7a2363e1e99c9ca16d3e778def977f1f7ce93f3f6059e4f7dd136773a3e77dcca18511920f078a1f763d111a616e198bbcbecf9ab155584 SHA512 70e5125db74d1427d70cbb5e68c34520a960874897299eb35ef2846123ab82b737fd71d32adc92e7d04f632e4ee8b64a154aa0f8357a9ece277ab7669df717be
+DIST firefox-91.4.0esr-hi-IN.xpi 554560 BLAKE2B 2551147898282dc511a36400e392b3c4e19b4dd935ded68c61211afcad796cef7a22061768d6ce486e81e958fcb49f9a4c1f303fb847d0e9fc8c4066281d7fb6 SHA512 315fd73b64538eaa6c83bd32afe47a64eb16c3cac4c8710b79cbeb38b8e6de1d6e14b678e4d078b8a39735694a21add2695720f7bdcd96f7b5f41438b66bd6c4
+DIST firefox-91.4.0esr-hr.xpi 528149 BLAKE2B 307d94c1a9efc507f931e69c34ca89d13b0327176a8b022f497ec33d8e1698daee5f1cd3d61eb21892db2647654d155cef12b8fcd14b61394d3e80129217fdea SHA512 d25661ee98fe4dd552a98d5cf9d2a315551a6ef80e4a36418486967e0a85e7f09c26e3d01d4d692e57c12f10336898d854f57ed6d8b4576a7cd43da641b1817a
+DIST firefox-91.4.0esr-hsb.xpi 558158 BLAKE2B 429e76be5ec37826ef7a41b32fd966e4bd8bc62719732a9b2e0f52665dc3ccd91abe83857c687384610f28c5c887952a9c9662d7394071a49482600b21e01bf0 SHA512 d79e612ab8b21ead195298493b6e97cc38a648b66da8653032483c7cb4b481efb08bcd4aee6197a69c5d8692fcb1c85dff88a3e28b327e85855598ddb7d5207a
+DIST firefox-91.4.0esr-hu.xpi 561985 BLAKE2B d30551d2c287d19ffafcb034eeb3a1c645784307f545cd489a1bed92f445edfbd04794918e9a06c608c25b917f22f7c69be76b8b05f053ab83157895b76c5c3a SHA512 05fbbc80885d2fe40d4e2dc8b8b95ad3495a979c9b69a223cf38b67a3cb55dfae636bd63e051cbcea777085173797a075b8c37ca626984b7bf5165267e9c8485
+DIST firefox-91.4.0esr-hy-AM.xpi 576131 BLAKE2B adaa4291a56a0b7fb202e890d0f8a05b7dcf56d9b6ee38015895c145050d5d4022f5150770eca71403229423945f6692dea4c4ab43e9301403d6a5dcb54ef93f SHA512 1f233daad38800c7adce495053bc76ed5a101893b1d0187b73062bd45e96b3cebe83eb435c44da7b374ea0a76e00bfa78e3d816b050492497c1e254f25ab7708
+DIST firefox-91.4.0esr-ia.xpi 528328 BLAKE2B 71c39e655836fcb82004fe6a7d6308ab337d41b89312c57bc8c8081a05accf3a75cbf2dd443da4b3e99f35fe47e091219a27c94c8a971e3a5ce1fa9ad3ea6a50 SHA512 e345f378dd823b2e11a6efc4e9d9301d8eb5368e32d1a3b8e27ed9379c2c311214e67099f3ea6ef19c86eb40cf80f46eee0333e5e1d787f2c1c529a79797f323
+DIST firefox-91.4.0esr-id.xpi 517718 BLAKE2B 6ae152e686f9b55c067d9e3758f71e7690b8421352bcc562a375daa47ed1a7a811ab1f62f61c6a9ba9351952bb90bb208893787f4eae63943202d36545184f1e SHA512 a2974e9ecd45c4615164eaf55cebc7f01737f5dfdaf3547add722f33d215b013f4fe18546259dfb2943e08707ac196c74a5c5ecb6d2e931142b2874220b97e72
+DIST firefox-91.4.0esr-is.xpi 467919 BLAKE2B 3abc9ab10dd2eaee9bd335b715300bca43a03c63a7a2a292d45d2ac9f43b216848d498a02493e77ff5be9855f77290d23ae8c635aef29566702c55bde158a465 SHA512 293295d4dc560beb034fe565ecb828f80a1bac7486e297b315c0aa452ecf5ba759017e61f9a3edcebd8bdf2a6a02b5c7c8a3ea4db119d19cce76ca8df5eed197
+DIST firefox-91.4.0esr-it.xpi 455746 BLAKE2B dbaaed50f0d19596bd2eb7fe1584fa14296041e04eb987a845d21883ac14df80c33fe5fce6a5b66d8a062d5ce147242a31860d1d250038c0a6f56b738477f774 SHA512 6b517797d0df3d163fec14137184ae112c948c3146c271806546d9288e424797cbc8d664346d02e3eb702c1c920ee67d084015815da45457ff317bd4d4c060b9
+DIST firefox-91.4.0esr-ja.xpi 584266 BLAKE2B 8fd1614855bca5054cdab88daf77681fd9b8ec8487e62dafa6cf415322bb5992dcb57b4337c2afa7d9fcb863e4c26d608ec44af887f4faeb99c9322dd15cf8ed SHA512 d82eeb7df6274d12e53b48a6a5c5687dfaf963b9a41173eac1d7dbd1cb0d620f33f3551682f4e07343dc97ac9bb3d5993ee5c26978798522a8972b655426f908
+DIST firefox-91.4.0esr-ka.xpi 582191 BLAKE2B 50fbd0919e98d1fbec2f88506a412246590308c76ac541c9728236007e2c4a4e9d7e2c85eccb2c52fa376bd1453557f6a17ce688ed93e72994fb44cf21e0e1f8 SHA512 e867e77a3817c23104dde4f989cd0590d78cdf278d0b8ceffd5189e6b7bf37e86394fa246b444b86f1a8e79a627f02c316aa1a891c6caf33d791021004a3c890
+DIST firefox-91.4.0esr-kab.xpi 541441 BLAKE2B 4960041931a5e4ed22aae97f6a6ed72d2b181042a67ba85c9c96a44740ce2ed1644a14759c4704f6faa36e6395e600d1977447e98b38d6b6da415c974dc62260 SHA512 b114aa5f922a831e3fea8f2ad25ae54dbfb0840fb3979a55d72ce2b3ca59644e14075ef0da57c6b465603d51edf4ae81cdfd926f9ac0e428b09523d9e47a09ed
+DIST firefox-91.4.0esr-kk.xpi 602422 BLAKE2B b635982be599b6adbac1593e844f65e49987ea649abc6a41e0d5c112f1e2973c703025c834efc1f3161415e93e9e2dbcd3b76c03a845b380fc4641c14f004ac0 SHA512 81d163e25d069de9fd14440219f96ac5dde744458bea87bb906b2bdad21dcdf749b1639c6e3bae54e9cf50ff13f4425d07cd861c2890bb5c1b4cf902ec3c3aed
+DIST firefox-91.4.0esr-km.xpi 531026 BLAKE2B 694d6ffbf2e5155dbd5e6aad9cfc161309a9b4056b2e41bc4506700a69e1f5bc4ab458892bd6987ec9e67ab454c43fe9bbe4e3d2eb38dfc8681e2f4e29695f5d SHA512 d7e5e2b75885c03631154de1dba4bce1e605805751a2d34a2beaa50232e4af51a7c7069454be077ce65555903fabc5009195bb37978bb0fbc8d7ac976e5b52d1
+DIST firefox-91.4.0esr-kn.xpi 496518 BLAKE2B c0e0d5d8ef46e3cc3e013ee3eed5b5ccf71ad9b9331fe1c56ad451b9e5c70f04561ec29159f5d82e6007ac97d407535ff923be297500fcd5990e1d0d917d2360 SHA512 6185590550c9d78444c96f0f66fe6a7ef2ef46cc0220e485ddc8a9fedcaff2d779e2096dcced729c5d19732b7bb7408ea2550d87c66f5f94afddcedacb4eaaad
+DIST firefox-91.4.0esr-ko.xpi 574828 BLAKE2B 22ab4c2598fab7105f4fab62f7d37390a2c3ff5ff1334309ec7cc60406d1c4bbeab617c5511a0fbd0ea74ac7dceffab416aec2aeb6b2b307fd0c2a7b115a5952 SHA512 40ccea4f669d3d559837b0196fc1688d75e02aa39162e02913cb0d9c19a1d57d4705ba789d53c38f4cd2afcc888eb153e2ef79a0c618e04460b90f3ea95f329a
+DIST firefox-91.4.0esr-lij.xpi 468276 BLAKE2B b53d636db515a94135faa29e5951ef9f9628603bc6fb6d8e288c7e713294babcef48aabc70d53a1a2e5c5141551e2d5f3e941579f0cf40e553c3c8e8a98e8306 SHA512 c1e27148d9e18eaf972ab2e12ef6474afdce88f0eda7e81d20326bcc5f815b78fa60cf79c9bbb5483902141d8b46c048c94e06230ce5d13526f1aa56985f6885
+DIST firefox-91.4.0esr-lt.xpi 556483 BLAKE2B 76b7dec6dbbb222e8763b18563e33a74666aa1f566b31671eb44cc3908ec8cbccf73a496840be41ddbc7619c02bb8a2663af72417e4cef2f3cd48690606acfc5 SHA512 99dc34d152d48d544059f5e2c5e070dba68f6278de804a82b82919058a3308858fa00556f306fa67ec9e2dbf73b8bad7ad6eb29c415b34cca191271d7d3b4bd1
+DIST firefox-91.4.0esr-lv.xpi 460155 BLAKE2B 1f0de8813c7c05d4c8208adc0377637a1df9bdf0f5639c2bf2d5b440bc5c0772e60499acb1630e65f8912a253d7cd449b9afdad0b45a77d6b15c82ee3cb51bd0 SHA512 8f2506be64284e762b90f5c4771730f627110aac5377281ea17647d1bcf61e2911d0ec3d7664a7f6d3d7799e0a18f72422117d9cee36d8b18188da729bcffbcb
+DIST firefox-91.4.0esr-mk.xpi 463732 BLAKE2B 215c755574ce9204e1facb159b99b88730fa920b2029cdbe78a7e6815df30e4187e8b726f6893dca78a6bd71814524f742fc939f84198b81c6dd8590d3ab9ff5 SHA512 8fdc6e67a9ddf65281ca2e90942a3eff163eaddb694abf01672f1f2e5e7845d49543079e396ccc8a2403a2189143dda32f9053873c5e1927c3b09b7b7fc0cef9
+DIST firefox-91.4.0esr-mr.xpi 529969 BLAKE2B f9bd79323f907b67bb845f91138837d4ae30ff2f74366258a95f4104ea07c3840daec921a516fb929a59fda61df69a5f3ac0a18bb4bc73b26f9296f81286cd3a SHA512 0f489e4036ab4ccf7e07262f9253882505c0bba20f1e07f57e0fbedfc6e98c430e847e1d95285999fbde16be0d0757127447ed20c83fbecb0500df1f1b1c529b
+DIST firefox-91.4.0esr-ms.xpi 445085 BLAKE2B d8771fe6917e27c3052ea72b416dba33126bb7fb7bc6c29040df431385f04f2aa44ed80ec63f507ade28e6f64d6d02a63ced4349a6f2b7a899bab709a994fbb0 SHA512 8b0b4c4050cb7343b1bf13495c712352f244dd746f126fc4ffa620ce29cbf4bddfd3f02d822626e01c7a200f025073ccc918c7a759133bc772c2158edfe52bf3
+DIST firefox-91.4.0esr-my.xpi 514591 BLAKE2B 35db61858c48264ebadf7ee856861ef29c7da74f98816c72ca230eecd7051e960fb3206571b31fb1c4a13c2e02e1f4ee7922b0194f78e2751f99c57e1f08003f SHA512 5906da191e64af4273b077d49eb518d00ed96d13e54839e9b5f2a283f548b825d1c1331076644ca7791dc4cf3beec0e43b59331c741ef0a760281430a10d93a8
+DIST firefox-91.4.0esr-nb-NO.xpi 525627 BLAKE2B e96be9c59aaca41b37df77fc20be03fc011a20e121a35166dce6e2e69fd9f9245d373656e5122d876baab34e28a1360e9f7e1ef00c4b97ad409421bcc2fa595b SHA512 900267d676c41c0f83ba866139851a193f0267fbd531d0524f0e21b356763dc898f5777081870f6f3e4c69fc64653a93631c085bf4b6a420895b23e0032b0630
+DIST firefox-91.4.0esr-ne-NP.xpi 474185 BLAKE2B c3e041da59a92cf37e5b3a69debdce9392d2a95cfd513a3ded00c583ba424292ce54b8a7b7f9cb34b20d731803d0b5766e943132f868db1ef9fcb81a9e271a83 SHA512 3412c5be0a63dcc86831a9c85cd744528fc4d009c01295984e9b1fb9f8498abc17bab6dcd2a6dd5770d390bb6fcb9b934c2c367d71270f272fac222924bc01fc
+DIST firefox-91.4.0esr-nl.xpi 533414 BLAKE2B fe2537d5846d6d62fbab558cf4e5083c187237a364a6b80da8d17edebd1e973599d8cd6895d55991c20196cadfc45c06bfeae616a8542355b82bcadaef2ad4cd SHA512 6a156e7ee152273bfdd49d5af28d26b3733bbbd7c8b4d448d0413cd1dce0d086dbff1246c7464ca7925a502a71bcdb85b7346ff25888f3bd891fa76a59c94d30
+DIST firefox-91.4.0esr-nn-NO.xpi 527058 BLAKE2B 64e769dda2316320d75bc24b28827feb92cfe788dd349ff69c0f708f7f5578c565e85789a39fce97aa37a7e3f7647fa702209446cfa4bc3b391b606c2584bb57 SHA512 bf95f24d1d226fed9e75fc027166a6cfda3e691748fd06b132953d56c31e42ad8ed261264d5e225b7de32c138876873e40a8e67b564f507a50f80851d44f2784
+DIST firefox-91.4.0esr-oc.xpi 548919 BLAKE2B 0ace64b36a718a54d6b33d1d93107ee9485324c7b1b4137dc9fe84dcf70b85bf0f4ae75aedb67686972b493049bad11e7362bbd462d04f2a18ec78c942f0eb00 SHA512 27a72e76cb3b51589dc460b6995ee57fcfcf4f8e579a95edba87e0ab18ae857d289061933127968bde3aa29df3ed4f2772bc44105068019c0c74e453e7473e56
+DIST firefox-91.4.0esr-pa-IN.xpi 589463 BLAKE2B 7379cba877a4d5837fc597b9f18ef300b1093a66349dcc4c8d2d25b85074c8d45e1647ae22db909e3825f5dc3da0b606d6cb5d6723014943f6a292e61b3c2078 SHA512 da19812759622e3e76d02ea54c7431aea15293af2029817ef3005aa58421c7da1a144fe93905eb078653ccfce0436cc107039ccbed15d562ef5ce091d98f6d6a
+DIST firefox-91.4.0esr-pl.xpi 552660 BLAKE2B ce354c26bb6f8564f9fd776f1befa924c9e139d0d4b09684f1df0866717829551c260da38f3f819e39f2ad98dbd1e047b9458ae1f7f10f1f2df36df6942920e2 SHA512 8bc536bb7f45f6571cc625cae8178db182382846f49bb14d3c840f21c3fe778c396b1ad5ffa05bcaa53aca017cd8b9e3a1fc921024a88f67ddd497f76fc19bbf
+DIST firefox-91.4.0esr-pt-BR.xpi 538494 BLAKE2B 064f775abe3f0e7f692cf8ee7ec8de788f0099fd8a41d0f0c64d13fe309dd7596005a2b7af2f869a3e994879be2d94cd9fcd99ba25b3bf388a8ad08bd802c088 SHA512 c04526f15cad1e32371d3e1d95fe8975614cf3295f3a80299a7a0b921c2746ce4c4df0392d7e3e24926516aa5eaec0f48460601d3154ad2abe230b7b20502a84
+DIST firefox-91.4.0esr-pt-PT.xpi 542430 BLAKE2B 51460fd6d910c847d1e7ff7d918990dd41d0e875c1d76d36a6c7e56192058c76594f561eabc394e08ef635b9be4cc6344c758733de83baeb71410b663122c55c SHA512 cb5741451651dcd8720f79297c632b410ff22b9a4fcecc6c12359fd03e06ed414b87a07ddaafad5b49da4582068ad268b0bade8cd51ddd2bcdca3fca007cf3f9
+DIST firefox-91.4.0esr-rm.xpi 533244 BLAKE2B 0844973f8a88e55f1e60c41ebfd6e73051f0f1b7ecffa64343efcbe52cf1f9783379975b6a258b80e18352c384ccea76cdeecb9dd153bcbeedd3932a257d266e SHA512 1e6fd16b476a6440af3754411071ed0c5d3b483ea1b3dd1bab921175042f4ab7d894a308839e3d1cf67efa78884249f1589bab85892f46520196badc8c5dd928
+DIST firefox-91.4.0esr-ro.xpi 526985 BLAKE2B e8ce39ccb62069614e4a811061865cbac81a712ce5a8bcf1f56b9962367e69dbafa4f591ff695ae086ad95bf018c45158763835487b0ab388cb3424df3e5224f SHA512 a8f003cb9d935bf5528291e9b9175183036e069cd8f71b0d8aa13a2d387b9446c743b958f212141c956e4b52074c3d49b7839e6b1c7708c9d9d66bfa68504763
+DIST firefox-91.4.0esr-ru.xpi 622479 BLAKE2B 5c546e993726cfe05930d6663e55a9254e94808d91e8964bd6253b5a66b3f7fe0aa17fb95c6fe2211b40f1eb3205a142ab31ce0fca63a351402d1bd9e5be6e05 SHA512 c8dbcec0fdd628d5ee2aa7bd35df9d000ae4639d767125f9e60bb706718acc3f3c827c2da8bda592847ec180208c4f4a01499d92414b10e9a101cdfe5540d137
+DIST firefox-91.4.0esr-si.xpi 485754 BLAKE2B 7898bc88ef5f480800efe25273b39345d5ecbf0f52fdd37db4f8c01b5f7aadf39def6ad1fcd8422fa2cc13542c73ac1ca4294ad01934895b857e5393df57b9b2 SHA512 3c0696368d4fe4963ff6ee4f4fa7ca15e4464eee567801e0ca10781095ca4d8a4128b0e393a1de6748492a001a941b3c9a072f07d3f4d020699f13dccbd36125
+DIST firefox-91.4.0esr-sk.xpi 562099 BLAKE2B c0c1e770acafcbb0c70a82235818b31d53f0b21447230fd88de12430585067ad418c59790f34ad45276b63e1f3cc6f07c3994d718bded1511f682445e83ec3b7 SHA512 dc3a49b3845ac78e6317a1651b072ea24c0c4e7aa68e2b61f0365d188e42cd6785cbdb1ae201b179d3a01fc3ef97f524b5fde1fd6649a3a86337a4db28a33c0d
+DIST firefox-91.4.0esr-sl.xpi 529903 BLAKE2B 69b9dbd60e92aebd07b31d5b52e7b7bd3973a05281dcc5801010ab0ca2221a661232d054ee4b544b1f0458b3b73cfa14e28871162fa639e83908a046b5317ba7 SHA512 f1d61aa23c06a165c93c15455f11e27a9fc77629fdf6615297f258999c4e7a1fd6ff6ea89efc6694252acb3215e6c752d2fb1d2b1ccc1e1a4dea9f1c61f064c3
+DIST firefox-91.4.0esr-son.xpi 424145 BLAKE2B 13973029336e622ae43522501fa715096db3bef7a2ab5b13e4ecc9bf45dda6083e5aef7b9daf078192f1ac2f846a29db58cfa7045915db01cd6f42721ce16614 SHA512 d397eab0f3e5ea3d9a7637f64bc1464f67adf76700a775524859d7e0833d1d4f7f9e1168e41a9e8283f8529c071128c5555ec4d270041dae1ce7113909d5b7d5
+DIST firefox-91.4.0esr-sq.xpi 544586 BLAKE2B 4ac371a525dd2df44cf6997a0e1c866980d4d861a8e80ea1d496e7f81016c814e654e4d6b4ac797c2d3e702bc0adff7a129c41ed3907133d0d2d952b8a61fef3 SHA512 23a606954e4d205aed77efef69eb509e5fe95326398932e0a8af36bde2fc3cf67b08b9a967be1f1b2d9901c7969aa0d1872f6f631df5642ff56c689fba743db7
+DIST firefox-91.4.0esr-sr.xpi 583086 BLAKE2B 46994159fc1ff22b78a6162c54e9dd93506fe604750a70c4a0fd395566403a46b95748c922696458a263307ed50472c4c9caeedb8959b65c002a18526795a0d3 SHA512 e8a9173c91738364e0ef4e9e8a42a5d9b75995ad10be60261407948404df0f31824c5dd93fb92e34b3f0a68ca7e41b51883b2e5eb45894d164ae8ea55d80dc20
+DIST firefox-91.4.0esr-sv-SE.xpi 536058 BLAKE2B 11ca31308f043605fa59a2856c8210715990c4e014925fc4fc07dc90c1400d622fcbdbc283bf622206e8ee6a4dd706e1aaa20e12d252f61bbc30dc6708e710ce SHA512 0be654894191d685a4ba9b4659d85b6ecdc1891687c10bfb89412f15ab8da4df07a1a9f64283efca4895b9c11413b9955283aa2bf3e088171e0e8f6ab5d5efb4
+DIST firefox-91.4.0esr-ta.xpi 510667 BLAKE2B b4fc8de02fd9b4888158a4c10be33259bf60457f5ff210e595a1b93f723cce0d2abb260ea00d6138f0876cbb05cfa337b4eeb1aef6f008859fe968ed1c7cf0e3 SHA512 7492d64b776f6c187d186eb7479a2362da725be88c7ea6bf1d8b4914acd4f8130bbe9bc7b192770982645d2484ee0fcdb9b05356a5cdb416af208df583f6e590
+DIST firefox-91.4.0esr-te.xpi 547906 BLAKE2B 2002d8dceeb2b0a61577cb334402b68cff1c2f613542d87985d2739740fdb577a38501d37df6708bb158685f2eccb7fba75467b25394ae9fee6acd1afc64c1f9 SHA512 8b85b5d1beecac77167ad9abced138a2f0e8cc3b68b2188fb80dfe1852fc299705d32e150c1f8e250929c7af10d787fb2477d1e731683d954ac48a6e9995d075
+DIST firefox-91.4.0esr-th.xpi 597694 BLAKE2B e34e0be0d0b93015c4ee577f70f796ff9fdf02e3bab0f25f3e51489ef05b831d06ab3bb7f52aa29b72dd1a0824d0b4aa69d6cc69635810caa8f73b89c8897947 SHA512 e3665e291f71f2b4d11c974c255eeb9e7fb079b705e1f70451e45ce3aa206ecd0ec5b28207b57cf56a84cd5175bb8a8b0735fc23825fb1dbf93635574ea40f4c
+DIST firefox-91.4.0esr-tl.xpi 513310 BLAKE2B b549526e3d1db282210c81c68960dcfb95d67eb554a0931869b1390ff6ad81796b2e0768bde840827b2b56cd74b064096330c3aaaeb9245026fe503a2dc3c8d1 SHA512 336cbe0837696ac1f2153edc21481dc658afc35b0c61ea0c87b996036647fa220c447f3e7a8f0413e219336845cc9eb049dedf16840066533bb02f8dc41e1f54
+DIST firefox-91.4.0esr-tr.xpi 548362 BLAKE2B c878ba25cc461624cd86a6a8789cda55dd018e66113a50dc280fd62d2f9c5ca79eb3c7c471ebe511fa451cc72a28f38d3f6538895ad8b5df81db45e68d74a408 SHA512 70fd852fa95f8adadb8a1c7feb3d67700598b720cc49a01e133c16213a92f9afd8238816150f79b2f15f24168f7839dc7e00ea9afb7b2453e446e0f375995260
+DIST firefox-91.4.0esr-trs.xpi 488758 BLAKE2B 220d3383d3064b092c1eaaa19de4981f7edec0edbe1dacf06d866af846fc338120c64711f160a7a0ee04624528686b554c701e013042ebc907b439443754d8b6 SHA512 337d236b29d1cfc103052cd1c651e6140217c0afb9092be37feb81a964d8cebd6e26c8366457fe65ec4eb79379400f86c3635111f6ad17d11a86c304d395bca6
+DIST firefox-91.4.0esr-uk.xpi 615983 BLAKE2B f78f5dd87d49792374225e1ede6311f4c8ffe451b0427bd77f554487c255c94149e207183d79ad79c6eef5d96a3e4f8abfb6743d031bc7afb8ed93db5d9572ed SHA512 ad06e287b5c96bb990621b410d9c45db92bc3bfd9c5c204acfbea22c4f4aa09ee9e0b4366ce1c5bf174fc38c7ee664c5cfbeac3fe38ac874007499b3553931cc
+DIST firefox-91.4.0esr-ur.xpi 554113 BLAKE2B 5b7447e25f05d3211920051bc9e6fb807bf569dcb99f5a8ca383058a2fbcbe50aae5203f94f1242ae8e389a1ecf9a1602730a2445dfc5ca01afe96a551f7594e SHA512 00bb497a1729a74a67a83b0a7512822c4415bdc71bf940f9731785cc87869d98514b9c8fb12e8167ed0eef80aae4cea0b30f0410fed43924108ba49f8d0bf841
+DIST firefox-91.4.0esr-uz.xpi 465013 BLAKE2B 989f3dda30973403ca5c1eb8a129278105ef645889d4c6f32144c2970e54b13472860a815762f7b2c2bcc1646f227f0d63be5c284aa18a72b10a1d9366627234 SHA512 d38a60af12c379c3b4d0d24b478b3a964dc31afad481d3303a7cbf39555c29ef7fa33465203b632f88c586a4afac97da6d74a3ad1fe431d919133206c11ba439
+DIST firefox-91.4.0esr-vi.xpi 569116 BLAKE2B 983c10b007eaa88f324a16cafb90924e1a1d14c118616d1c526d4dbbf3ed6db339978d2de49f53afb53555f5bfaa63f4a02fc4469035a102332bc305c16ee533 SHA512 e33542cba623880b69ff11551380e893f6e6485c13855a9c4121bc88c1037c22510ab12efdc47737e3b389f6bbe278957c8fdc9ff8ad2f3c7e831db9de328ce8
+DIST firefox-91.4.0esr-xh.xpi 426318 BLAKE2B caa90a68a11059bab6d54800936f247c692b7eb8aae30178934d2486e635bb86b540601610062f32c6496399cb6f446741cacc559b7abd280eaa5392a894322f SHA512 08ef35e0bd42451280acf8b6d4c2c27b1c0b32fc070dd289d6405122f423e55b6eceb0b1235f865b5f95a0f257afb037f6cee48407014f7b435f712d7cd30867
+DIST firefox-91.4.0esr-zh-CN.xpi 571363 BLAKE2B 353648ce0c0b12a1e922e4169e4ed31e0dab3337a2e5fa53879e38aa454933cf4e76191da186053d888f755a1bca176e7e23d856f5b7aa9ca088e12a59791b0d SHA512 db04703780fe73b23025a984511f3e55189de663b563ed1c9dfb95de98e648842a623e5deac341fac9afd568b33f48ae574af8f5a49cbf808158551448deeaa8
+DIST firefox-91.4.0esr-zh-TW.xpi 572071 BLAKE2B df9f18fa4cbede2324aaff48c503b58cbe97f07394a2ddc00c7bb2a8e9e8f2ef0608374d726274bcd3890a97bcabbcbd25b56fe14db67c8cbe15948b612d5ba3 SHA512 e279a726a6014b6c473c275c8c3a786714757ca63d6311637f42787f2c5bc2778b36bf46302b932ee1a9cf478ac6a8e29382a389d84c29621d62642365b07360
 DIST firefox-93.0-ach.xpi 452270 BLAKE2B c7fd81469026d99e21553ec59d0d005e906915483b3765898beba694cf31c02aef3c15789a5c2e2e2d1ee242aef323ca7fa1c142912917ec2ca02a8cb9c604fa SHA512 9a4c7f880801eb1c4391a57107e88e3d43e6ce0a1bd617ba4d11951957e2d62116f102e55bb62db22378460c68d2ecb3a9b9b0285951c46846920ae02360749b
 DIST firefox-93.0-af.xpi 425657 BLAKE2B 8f0f1df2ddc330f386d831696dbbbd15f639b0d95ae4d85b268924116f93f1bce22adc10b6053873f0ed6d69f9067515774b7904f7595c89a25edffde2e25e97 SHA512 f8c122c624c139c0afea5920f063b981665771ae107d32b654206dc0d00a8173230a357ca72649bc636d02825f1af90d291b5e09f9b7044d05b4af1ce39f6e6f
 DIST firefox-93.0-an.xpi 498005 BLAKE2B d0830dfa4f7a0ea4c85a5a3a7a1e90714e2e476024b77d0b8b44ce4ad241f0df1f0090eb4263caca3d05a66c8885c3c75bf167ccb7055716d7efc01ba4554515 SHA512 df7853f86853cc457eb85b8130f7b2ebf7be97ce28f23f963eb9b05b16dae605c5d3f3b925c98a0aa252dcd84e172e42f87256feac042af57294f8cdd3e69383
@@ -483,19 +578,120 @@ DIST firefox-94.0.2-vi.xpi 564620 BLAKE2B 19dd083641d232cb399e4f8024fe1e5a01a0bb
 DIST firefox-94.0.2-xh.xpi 421170 BLAKE2B 76ad46bddd3283e395aa06b740d65a8b8c2ab70d424e9ea39a4ada42006f2a3234d92fa6092a720261ea391a5a595d01d3e0122fc209d8431d434706eae90658 SHA512 e286288b09c60f6d0f2ec166cd64149441891ae8332e15f22d571b78d2b92f7d01aeb06de93f5072f8198151378298636216114ae23948bb0fb9d560d4eba73a
 DIST firefox-94.0.2-zh-CN.xpi 566220 BLAKE2B c011e86a071303e3f8957ff62a0ea9f6bfaa93b8b328f2e506af83bf0008e990e92cb275488b6767af5dbbec40986c7f7c8c63d1f50c25cd13710d900ef58e1a SHA512 5d67af7ebfb197a112e40985eb9fc49f98885137314c40eed8e7fc136b5d7e97b5a3afc81bc33a5a8eaf1d27cc9a31a32a1eade2d8672abd3765bcc86fce2c23
 DIST firefox-94.0.2-zh-TW.xpi 566884 BLAKE2B 315ff12d2acb993161bca86c3bb3fe69e0f9f90e37d67c0f3c79bcc463b4d1c7da10b70fde8067f85717d2d0435c23f46f5170625c63f06798fb7058f503f001 SHA512 ddfb47be87c55d1707c890004c066f57dd4adedb5b0ca8675854f9c18491d3f765cf1a5264253639c256ec1306329b7e63e15de07aa4559ecf9c680e297ba8cf
+DIST firefox-95.0-ach.xpi 450515 BLAKE2B 3fe20f62740464379328642cbacebc9166be39553e0f7158fd5d3c805874701917daa10f215e296b98ee8ad111e3ee66e069a65321bfe2da364ea57fd2c4d37e SHA512 551fb9f5c03d9a1e05e02b19fd36cbdf91e02a196f7bec80672efbcf30a109adc8331dbc49cb4e2a0d085c896f713af6c6469d8350f477f47a27b2aff922c7bf
+DIST firefox-95.0-af.xpi 421588 BLAKE2B 8e61208a72754a6f76458284baa5147c7a06df3ff7d4f876d9b888c7525f584907311e2997db5d11fe0c2d68309c065d27cea2e5e22d2f04566a89c36dd0fc4e SHA512 346ae3a1436e6f277a86a0238b166d002cfb9be361d6f59d06c595c4ff48db41c90d6adef4486682d7850522b48abd00e0380461af12727b2d5bc2fb8eb4f637
+DIST firefox-95.0-an.xpi 497839 BLAKE2B 6aeeefc0fe2bb28d851e1694ec0449a4408f1989268f2436f20dfd00386a7f5e21b07a941a27165b3b8c09c1cae8c7875a16a48dd0a44ae953d85569e06ab981 SHA512 acae1e417303fcb28c70fff9e8c3d86efcb41b3417d3624a49020bf1310ae5a9900054eda57e4413c8424c193a2b8ab86ebe0d45046c19933a39421a6d37c881
+DIST firefox-95.0-ar.xpi 556957 BLAKE2B 9388f44e38fab99427b5d81f0d4eb4918e4b81198d4b60e916b2004c1086362bcd0eae964d436c8fa1d787ecf3609f0499b0d1d754e453321999158cdcd22e2b SHA512 1b15787e4690dff02aa49494e018501c95ba3f5b0c68362a9735682c84ccb8a0b0fc94d919b0b0a15fd8333ead5b13028303c879e972d7d2d3af21c97b64e369
+DIST firefox-95.0-ast.xpi 495632 BLAKE2B d3684061045a422989e76853dc0d7de1d3deeb20b789aacc36f459620de7c9c472fb58c3cc06421c236e603345792efac61f9292ead66dc8999e1c4275ec1e13 SHA512 76bfcfc87f92e04aba40af0955425ab261227642e6d3e8cd97f2ab4cc04ec751ba5425ba3facb0d9ce4eda74041058d055bca068bc258f7167a37cc362ad7bd0
+DIST firefox-95.0-az.xpi 486489 BLAKE2B c41b7060af5c641499768d1553468cfbb068e3eab2e3549e29a190a4ea27025c91bda839cb1aa717aedc46a725f4e1d0df61dc1e04e73a43d339ef5c6301b03a SHA512 727af196fb12673d3a9f59fc34e82fa99a2ed49b92da1023dae2048f0dbe50498261d17243288ff84f3f64470109920d106b1a959476ca5413b5a1efdb768dc9
+DIST firefox-95.0-be.xpi 617804 BLAKE2B e14e9064c73c1247c77f74737ac8409342000e155768113bc9bcec2ce0362333b3131355bc66f81a97ab3d1df497b76d117191f2823f70bf46414d7dece53495 SHA512 ebb28844d8f70aeec72ab4262fc8bb53497f4293b97ae2e58c9a950644f4e145316064214e65af85e5f7f17de42bb1fb1de175677437ee7006e6b468a506272c
+DIST firefox-95.0-bg.xpi 564532 BLAKE2B 70a722b8772f10056efa951598d33e04e36f213b1c049d500cb8afc76883a3495805e1cb2ff6ae4bb5140032029bb018d85903085cd55551d947185c44020eb4 SHA512 186ec20af2bf495200d48e8f367a7cfd01a9da3ecc7019675b9f66bf071e660b9d79e98bec59ee02074168676fb303546723231c29b44e4f2bfd9892abeb8406
+DIST firefox-95.0-bn.xpi 553373 BLAKE2B e1a221ec3317ac111a4ce439df152e764886b5c9b9a1a9a71c44dcf32f243d9bd6d79356f9faab438f22cce2c7f04fa7933cc6732d82819720eb76451a0fa5e1 SHA512 e56695513a63c2884f11b555da6c4622dad2c8710927310ef2e1e78bb028fb57c1f7ff07580aad01dcc7dbdbfdd1fb876fc09b155a755b640cc94fa76f6d5e41
+DIST firefox-95.0-br.xpi 524087 BLAKE2B 2070ec3ade3c8c2765b6c130699a3e5297fb231f291b0379318bb54339bf5d18dba8e3a3627b8c50a80016e5e6b1a9eb4ddbd9f91c428d32b5c251c781643e97 SHA512 e6e2c9dacab74359eff56da967548c936f28bbfdbae3f246e45042e4ba1fc650c942b4b41ef08979a5ced64f2a99cee57c443a69d447918587423b496e537b74
+DIST firefox-95.0-bs.xpi 460948 BLAKE2B 1b9eedc34291de5876c3443d15a39bc8dd59e69bb07789c9c34b7df9cac39cbfe15a21182ec7c23c24a0068d0f6df944ad8b5378d156e24b5fdda55c90e7a6d4 SHA512 892218d00a0f3b08cb540dbc8bf248f93008c0edd190d292153a32c8a4542ad664839fdcb7f371391278eee289815f16949502ab4f1283ea3c7821663b707243
+DIST firefox-95.0-ca-valencia.xpi 526570 BLAKE2B fe44ca5bbbdff9a095507013da118c4db227c8b53441ead8097aa4ecc2c131a2b929897cad64be9172c732b7be64ba545d963758b4dde02e18e4682a2620e3a3 SHA512 87840b38a07db17f82adf31e37b9527819c27a62453304885772617548dfcb90ef0ce411ed2dc4d3189298e9bf4f8ede0ae7d85d6bdd2f74129d5001a4e21d5c
+DIST firefox-95.0-ca.xpi 529728 BLAKE2B 6dcf7a991153111792a79258cbbd8a6b916c2eab19b5eaeb358a5ecdbfb71bb8ab1e2a47e387e77b65c566eacddd5c6518df6b24c51ee128d9e1fb81c6801cc4 SHA512 9676d4af6f7484092d459b726a69e15b29563f5de26406ecbb0458b99a8fcf997607845f6349e26230c292fef0cdd739bda1bc06e674b9e382450afd603789cf
+DIST firefox-95.0-cak.xpi 550291 BLAKE2B 25d588295feb5b063696b92538ae59c477fe60d036e18d668841a1cdfa9a100b6203dc83f494f2c1f840944858ddb61e704f6f74a28a428f03afe611577e4e13 SHA512 23d01a09ce27cf835b1a08df86304139227f017ac2946be97f203a8074894445792e9c06ccf53ed95842cc9e80a86fc954b718f651609c666b979806908dfa54
+DIST firefox-95.0-cs.xpi 560520 BLAKE2B 9e4b836d02cc00fe2bca57326245a82bae2430475f7f9e9b98498fa61241c2bd75faa5f3babdd808e6f2b61d3ea36c42942f56563327003e3b7d0093192bb580 SHA512 46a7736f29465650b19fc7fdfa9ae7ba49ad6212530ff42fb21a04fcc1773bbcabd02da2ab06b87fddcfada57808244666932eb596c978add1ec8da8bec2cf1a
+DIST firefox-95.0-cy.xpi 538502 BLAKE2B 33953d710b38f333387a0382d39e657665c0a3fd79cf20fc70adbaff0460d71e3dba092f30845d1b98afd213dded01743ac10cd1d9bc4b2bab9e866de3d6ddf8 SHA512 87610b36a440aa73106ff3d198484ff644b82d3d23be56f51ef178ec88e9dd163bde390c87799020b10e803caeb3a5426e2eb51cc8ac27847e988b1ce8bc7f12
+DIST firefox-95.0-da.xpi 530402 BLAKE2B 1eb31b2569616314b1d7831ccc1a6f07f6b2c6a4102af056e41010a70f4d7914c2cde8f0da65589e6013b738ba2be38fa9ca0600e0eecaa441ddcf9e1bde019f SHA512 32814bb82715ded6204afb409a6ca0a790ee8931e6e10c4697468235dd843660e1899b17e24efe22fa6a5b3274a24df1769453ca0b40c48130e06b9d0a3375db
+DIST firefox-95.0-de.xpi 549565 BLAKE2B 30293bb4e923721df296defbb314921942597f9b4d5d4ef5fa19e388e729235730eadda3baafee31bf4cf21a4069193ed1a11277af8f3f32282b33bb40d70f2b SHA512 2e60f80e7bc3594bc14648cd8ca2d6db143bddfb58ffdd425007e278af014fff3c87eeccdd7dc3e2be12ae9e3b3176a10dffce453bb4ff7f85d91ee7d3ad93f4
+DIST firefox-95.0-dsb.xpi 562325 BLAKE2B 64529835e0eb45a75079ec18c45e9af952933cb9a98d5e0c901ea0ade4b77315584fa2cb17ac43b130f5aa6f495d55308be88655e096926368f86b968203ebcc SHA512 06bafe2c5775bd4e3ffaaaac0670ad0e26c96ab1c111bc6e5edfd839ef4cb203924aac1a295152f59a61765b2d63ac5564a35497de7ee1a105ada242d7ef42ba
+DIST firefox-95.0-el.xpi 634235 BLAKE2B ac8a59203731c49daa2340c714f896e3ac3b256ad3c46bae9954a4aa1b757dbf88afc31606fd0195b8b7093d0544b52520a5c7ac411033df0a10c8d9659ade7d SHA512 79926906f8f965424a1bc169869c835d386bbc5b09008bda013e1e0a0e9019b81fa265422d5a6f667e2a5cfaf6dc9aab6304a799bd852cd3f5fa16e5cb9c055b
+DIST firefox-95.0-en-CA.xpi 506099 BLAKE2B ea570c851e6f50b5446fea06df857eb3bcaba0ce1ef35a849089c5bd5b55f25bf503d107b68860e7ee368c4cd36e3fb12e0a44baea48f3c10b6a11507e018a02 SHA512 279bd4845fe0112c1408a1684c17788d0c10ecd933189009e0a5d7e78557415d9e6ce73136e9d2c08aeba60a3cffdd79799c869b12bf2bb60d29f6fa51981704
+DIST firefox-95.0-en-GB.xpi 507069 BLAKE2B e53f9632b22fc3357f6195960b619dd17d685d793c178b0cbb03beffca2982db758a97067f14a9d070bf1adb4716cb0e9baca570bc0f588b04948bdf981cf1de SHA512 ce05b73d2170b6323a1d3b1fbe1e2b29a898cbac8c304886e1f620a2ac3a473bfd20247e76261e674e1a36b392fd1f52ef409acf1fab3adb4ad1751552b79297
+DIST firefox-95.0-eo.xpi 531427 BLAKE2B 931e48677238a5b8a7f9b94cb9f5cc47b4b72512092b14bc196dde71172fd0049104a6233eb7bffc42bbf0bcc0cd01d502eebe7148b7c0225a9eb729aa20ba84 SHA512 8e47dbd945329c19d471cf896314066f4e6d3561eb4774027a5f0633b56b0c5f7bf3d4342086d58c61b75ce850b6b5147c5492699283a112330371b68e932533
+DIST firefox-95.0-es-AR.xpi 542817 BLAKE2B 577ba91822539f5ef062a6af801b212764b6d13d1ac537759ab8ebff50c56a083f626b7f818dd8a6499dc3d8abfd34987c5a2a80e09ed993e5c034bc5b17ae51 SHA512 20e6c6463df0738ba0c99abe8e0ba8f50207153dff69caa58addd5e705408f2d5e70173cdd7044cf098fddbd614686b980bc39f96c5ebe39396e820176a0c364
+DIST firefox-95.0-es-CL.xpi 542407 BLAKE2B 1d5f9f81599bb0c6af67e68d7ee3a09759a047aa9bdc9badda27973aa54eb6e34e2c060fa3503df9f6dab6fd86b684d8288d24bc6e9b456a323efdcd411b6001 SHA512 4c358e45f859d8c4c0f2a4852e6545cc2fd0d01bf2ca629db643202fd5958efbccc48c4b9ff28f37a5052257e45c28761028898c306b9a81e98d7a88dde85fc0
+DIST firefox-95.0-es-ES.xpi 533165 BLAKE2B f0a3361ff395c85efd8fff3fb68f9fe791c53d6542a992feba96590ee44078381e4769629765a1f626cb428fed34c7ef616a00919c224dae9d4feebb97a63f15 SHA512 68f6090a698cc290f2cbe45d5346d706902ae41ce839ce2e1e73db5b2705fb3f70ab1384b0529e2ab2bd20aa2aac425ac40284028bde4e9b535559427deb3b8b
+DIST firefox-95.0-es-MX.xpi 545980 BLAKE2B 6502c56441b0244677bcfba298a533f617954a51cefff2845e265666f9a8496e11ebc1e38cb0ef4499c729b4e9de1ae0bc3c8b73e2000557986ea720ed2acc82 SHA512 3283b0c15b22c31d3558c15c6448bc0fac3df2ed7d5085e31b86a682becee3f636b3f45665e1f55cb3ad569bd6b5c7ba47fc7010e5ca639a5c721b98689a5e1e
+DIST firefox-95.0-et.xpi 503978 BLAKE2B 58455a3a78bf9f5a85fa4deebaa624e38ddef24f4132ecec02d5c3048f7f549c06ba9684024f4d5c04e90a1dd9382f04a824e59f1c92feb57351216a0098450b SHA512 688637b0aa911a5cfd4054659449ecb24cfecd1ac7b2bb4e99d49c2c1077b473419cf4d44fcd532f6d8dad6b69fd18e8cf7ce69aa14fa90a0d60e99c76e60c8e
+DIST firefox-95.0-eu.xpi 532585 BLAKE2B e5cf65694bb88c9b043daaa43eca78cc18f4a555936259cd1049cf93c16048939c9636886b1368c26c9e1cf756105ee3a16e9c3ef8a12a4a708f87f3a8be15c4 SHA512 1198626f7686359794907dec80c1772a8b1755bc46e84d953e835c35ba41fb3f66ea4bc85b92ad07e364583e8d3b290c60afeb80128e8a9421a879f6a826bd63
+DIST firefox-95.0-fa.xpi 556251 BLAKE2B 6fda62ee7317ff5015dbe1aebc06ff0932a48f02829606529b0ca3227d82a4940f665a8b0ee5bfd7087481d90494ae0a7722da3c2013dd7dbecf90b653b6ac92 SHA512 aeb404627ce3169e3e24ab3ffc15682c3524b39f0132d1249e84abf305d6c488c709c2425c2409d3aec19c42d9ea3f48b9f74b8ca51eddbebd6ed701c39e5bba
+DIST firefox-95.0-ff.xpi 468414 BLAKE2B 32567ec18d5508228aa7f6ed47d366ed89d1bcd6d555ba09c1df813893472a07efc2b920aea7eb0cb91dff5c2957337da81089723ba7dddfac08aa5654b8f400 SHA512 b3ad7c506b9fb1a34bf1fd7d48982bbfbe6a5a0002fca3c7218ea55ca24b11aa5f75940d1f8f9490460b1266f5cd28901ef6d3be07f8c8cbbd65e3e6b3804b7e
+DIST firefox-95.0-fi.xpi 527602 BLAKE2B f98e194dbfc087e0afc11f0b8cd8083179dc046b9ea413c4bd4371b45c50da5bcc899ac247ca28fd999f94c60a98eed0accb3a0fdaf94ea319d1353c5bd56add SHA512 a6a48e1d5bae2d41ee73587e7e79b98415d61167c2c119079e5c6803c4619965445c5913139f420554ca537f2675d6eaf34669a9e1a58e61e5dc9907d8ab42b9
+DIST firefox-95.0-fr.xpi 553723 BLAKE2B 915a6cb4bcbd6eeeac431859fb2e568e92fa802e4ffa12262acb17c53d99ce63cd54c10a47eda458d10a90ca2c7c34978a67ae7998477c775ecaa5285b9f4ca9 SHA512 c3fe187f56ea1390c4dcd0f0776c7dc8f5d0463621af185401b3ef3912f78d6ae7ee1b227093b2c68cdd304bdae9bd944017f00a429ec59d3ee591d55d82d7c9
+DIST firefox-95.0-fy-NL.xpi 539299 BLAKE2B 3793ba6e07eb8bbd9dccfd6c8388019ab38798bae947e45033d5f557d1a4c49144108cccbd6dc8d7a995fff0179b05ed8e27ef34e091edfbfcf9cece618fefab SHA512 d42354fadace36cb3eb40f18f1fc44cf8ffbdde3d69dbfd215b0dec0b4eb3e809a0eda212575c649d5d052c23b7145dc8b37f09103122f928b6be77a58922105
+DIST firefox-95.0-ga-IE.xpi 456359 BLAKE2B ee362381323e1ab0d9452379bc6274807a3331cf35a5a9841e2f3fb436343fcc1c6a302190225dd7b7df9e061450cc40a0874fa4582b08029e293ee6e83eb574 SHA512 159ef08e8b271c18d237d50157c3626e6fda291f355fc015f16baa407e11ff664b7e9b52a4e26ba8e0cba68ee2a1fc2832ebf7d43506bae4457ea8064a8be3e2
+DIST firefox-95.0-gd.xpi 528510 BLAKE2B 2f03ddf60f3a0780ba921406115ccbc0d5985bfd552193d481c57ce7e7cf8c3625d2a33e89c2cd009fd3facd174fa20d9cc3d8b95b6f1fcb7f5105779529f956 SHA512 b4d447b813cff0b394a1f93a4f8c17cc2a1369872e506ae868b5131264e0c51f262da2c48eff76b6a3e591a4248efdcadbae53e6d5043bf077e1e5194c2a767b
+DIST firefox-95.0-gl.xpi 537648 BLAKE2B dad92ffd75438dbc8593d7e86057b3e179b4d5118b5f1e952a724ba5fda37a6acdd4034957ab00f16c645728d07d6bcf200fd1604e1a10ec0f57a96760261412 SHA512 65377280d2da2647585ee254b4f60a7eb06794f09060fa7eaaa0f4eb1df86409c338f6c8b000a5d9472b355701efa4df2edf3358b5ef146f928098f5a8f8e3ab
+DIST firefox-95.0-gn.xpi 553613 BLAKE2B 2096a50dfd019f2ece3218d7948bfdd63939f4da5d3634f161d21661657f4b1020ba27844a36d841577d8db2d8a49222ad05dfb0b5564597ce585ac23ecf633b SHA512 bdd7e22210fda6ba1aaac0bc2eb93f137bbc99fcb3c6ac18e822f25956b0eff1acdc407181d7e0e077c59cdedb912e8280d6ceb546553a5bebfff291a24d7fa2
+DIST firefox-95.0-gu-IN.xpi 525936 BLAKE2B 8ba13c0d070ea669601bff1389d5a0aa8cc6af6fdf0a7221e3171fe5615abba5bb1a26baf5f12aef1199548bd823ea40edc79e045cd45db0e1effbd310be49f2 SHA512 317d7f8028be22805708623047e2fe3d7e95ff82c6e02dbe9f3b5a57d12fb5bb91af0aa9af9f82ba64bca737a7fdcfc6022438b15fabcd1d5b1d860661ac0946
+DIST firefox-95.0-he.xpi 553664 BLAKE2B c66bf40ae133d60485b0965d4a20d84d7bc5c60ccc12809e374e4d641455c7b360fe1d4eba28f2107e590c76e22276540aa18b458b6ece18332182f6d9d37c06 SHA512 918900356296c9a62d6e9b9bdd38dce19b88571f23917879af49a8eea60bf5b836aee3b81a3e629d7b4471a75e2e7c97db67cddf9ceab90d7bfa6465fd2a6391
+DIST firefox-95.0-hi-IN.xpi 557072 BLAKE2B 467778dd8b16dbd9afd11347892c7c62f63991381cb3639e5857c7a4433c7572e4b815577aa89014a40514263e1cb82e3ff8f190c956b3f607da99e234eff20e SHA512 39b605fe5c6e91d1c5e0768acccc05fb22fbe340fd235822fbe25be04dbdc0d6bb0e3915ef7983d3b079baed88a527de3ea307f9fc1de5a0b7ed6d7f68110b5f
+DIST firefox-95.0-hr.xpi 527718 BLAKE2B ac46ac1454118daecba9bcca0ea7ca939b5fb01eccafbdf99ac4800a266ac501c15a31975ab914ce37faae66cbf1ab591608f215673042c14fc786cf2c084f6a SHA512 77389343ae828186e7dc4ec4e34738ee2e09920ad5e3090fdb94f57639d3b35d21e587102fbb74c5dc05805c7b69785292d298cf102c3e7b581c229387777cf6
+DIST firefox-95.0-hsb.xpi 558439 BLAKE2B 7e7606d884e77ddbe006d3f5909a797f3649845196323d5ddc3832c97b388c7eb5995e2a8aa42b94ea6bbde96d9dbd3c940db3cd3ccccc9899bd2f93385f62a4 SHA512 dc99c334cd3808c96be797c732507884592881defeee75012254a934616c564f1a77f306fd3bbc5852c71a5f2e6244212353e7c3d62cd0bdbbd7ee4102e87fd7
+DIST firefox-95.0-hu.xpi 561838 BLAKE2B 27d99323b98cd46f1a2de46edd451f19acdc780564f99d63c0a4b2f345cec9959123d5a68fd06f3034abfe511116c2c302cc8daa0493ac1eee2a1639a072605c SHA512 149c14be3a22be6b18fb352336f11af2213ea5f3ca84c8dff2a9bf902c03364ca013a510de9841ca16486e2de2b007209ab34a9163ff1a5ee203d694015aa752
+DIST firefox-95.0-hy-AM.xpi 576865 BLAKE2B 02afc0c5b116e384eb73eaba9b51d53edc38584d32063d97c7ee7745c15801d4c2fc0227468d667a9bd114ad46c9d215ba57010732e81022eae1a9b0d8ea32a2 SHA512 8518abc97346f90b75978cb3a48522f3b072a79f5d589ff5566b9836f3918bf834390f7ae30a881533167dc139f26ac3723e128968b93bbae4f34ef93e2684fa
+DIST firefox-95.0-ia.xpi 528438 BLAKE2B 39b4ce0a650a4f4587bfdbde2fa7095c2bc81db72d4a785b8597cd5dbdc9826575fe613c9d5c1372f8ca6a1ba732364fb10f6998741db4bceed44ba39efb04be SHA512 492b7617951d24acd00b1ab28453f35f2cf88722dd97105fc09d1287566cd27a1822eb4d3bfb953e5d1285cdc7bd7cde9c74e58deb0206db3e9c107308de66a2
+DIST firefox-95.0-id.xpi 518116 BLAKE2B 80f9f3fb82c47a3cd23660dc6745da3ccdce80fe996c6c530bdbd9190379692ca571949c5ddcf886e89aa232c25a49d1b6c44d167dc3f8b1ea23932a1b19b41c SHA512 83f72af2c7457f0555cd9a06212e44846867698c813daf72c190bd8bd311cee4565c254e981a848cb5359fc945f0e730bd5168cf8fc763a430521e47102ef538
+DIST firefox-95.0-is.xpi 467522 BLAKE2B 7294b6dabbe6054a8e81abb9e07baa0de9812d413ad6765374332e5f110db262fdd9386109d2fa237fba387de7529dc4466fcba39f38fcafdda693fa9c3ccbf6 SHA512 d6301e73b43e01584dea2250a45fa10a2b131fdaaa82988a43a070763c347647e7d4649afc54390c517c879a652a77394910057ae569aad62a9133859a5b060c
+DIST firefox-95.0-it.xpi 456459 BLAKE2B 50426f0831287966e74f20e6af143fc6d43740ba3d5c3d69d7a11ca9773fd87a5ae2b7056ca17c1570666cb8b5cf415c1fdbbf0a042ff35cfdfc2bca6c032c79 SHA512 5c81581b251f8772f39dd9084798e4ee260fc2145224a16afbb4f2568a7482ee3cdc46779db3436e1345ba39bc4fe63aa6705994f2f0cdb0dd633b88594722b3
+DIST firefox-95.0-ja.xpi 583404 BLAKE2B 045f27584721c8c0d0a04d28f6956588ed013bdcfcd6f8505d5e69168df86189f8120c5f0f55c56c5803dc58258b7cd524bd3a81c1943612221af7f417394444 SHA512 7daca5ec67a72d3ea71cf234feba68f1d8abfd849b252d0fdee4e8782884f78ba6d4fb31fd0039ae05720be1e56e92b6012447afe991cdebb113078340d78d18
+DIST firefox-95.0-ka.xpi 587672 BLAKE2B 34de6399c51aabe30c28919cf5aa5306fc75d18a2131ee9fff94f19b264a9c2316e145ddd347a2f9e7fc204a249f338a7c08254747ac3c41fbf6e76636ad33c3 SHA512 3a43d89333a34a346a94e65faafd296e18266d6a3617ad8b7e1f4599886d1f053855e0995f19ccf8965afc88c22898cd8a7da02017b6059904a23a9ae2773c4b
+DIST firefox-95.0-kab.xpi 543119 BLAKE2B 47130c805f67c2436a5269ea4b5d35d11ca3780f2ee1a3fb7a34b16849dd838e24e8418f94df8ce33f8754cd37347a141fc445d908e0d11001a056ae52da5ca1 SHA512 8f9bcfc33aeda142674fcc6bdcbda9ddc5d8f6978f75ba2abd0f5501c25f79c67044ace25ce4eb2bf438d72f5f243af1994e1cc33fd4eef2843f9be204cb9c5a
+DIST firefox-95.0-kk.xpi 601962 BLAKE2B c842658d861010559c64b3944d389adbac21036f0781f96677b6a0ee4511e5d1bfef91a94adb22df65d978e9072c504d05e4708c5b1f740372eb694433432a62 SHA512 cd73493d0a15186192e5ff433f6a007fdb49529791bff044facbe9e5344116c496de5f0da74be661614a068964a967784eb786e4d59f49dd6e0490efffe36557
+DIST firefox-95.0-km.xpi 528933 BLAKE2B 1e459b9b8826a509b3cb9f1e400c6f07c95e2351987562097b580263571ad6db2c02a599f80ca8b96c2608900e962626d37b070aff516b0cdf7f59a6d5b959d6 SHA512 efdfaa7b197015cdce00c6837eedc776ed53120ef8fc95547aee6118a7bd4a2131fe8e0383fe0940f653241c50a307f5abaefba7b11335ad62dae0c0aed6f780
+DIST firefox-95.0-kn.xpi 494304 BLAKE2B 45cf6be539ecda4fa17d3f88c726384266f8a9866abe8356df193a5296018907284a49c9d3bc4bf4d9ac7f07238e592bf49a73180431b5930c816f8e743a5c1d SHA512 e62728ac977a598486e181b936a0bad4c61f6a842e06fa07e615015ded640035e92dedd8dd4e8ad0f141b60e4b61263747d6d657b987e11f7eee6948007b1b92
+DIST firefox-95.0-ko.xpi 574782 BLAKE2B d11ee747bdc13e7b0f9202397068cb58100849480921b7a93bb791025856fa6e7e714d716c05327f8ccca2c104f273c4c229e7a7a3242bb7482b515938f07e86 SHA512 58621fa4487d76dda0335ddf76eaa98c2fc61b5c37f3445d83472acd0623bc1370efca5a13d26ad18ea1aba5f437aa623977804ee5bb1d41c76957411fa64d4a
+DIST firefox-95.0-lij.xpi 467379 BLAKE2B e038e7d3cbdd75d4410e7938db17dbe18980ff66441dd014a9904fa683f2e2672ac57774ef462e55630197801e99c43965d2f9025bfdc16cbcecbb701e73ee7d SHA512 0ad2699fa1d96833b8d20428a420a95cb1ba096d195562dd351be74eb6ef1bb37e8b3b1838e38a6f6e4b19e3a1f0af427e1fbc31d8e83974243fc6e40e692845
+DIST firefox-95.0-lt.xpi 556126 BLAKE2B d57e3a4da3173169337963d84c18fc01a212124422e2deb3aff177a36d3968beb1407c51268c30db5d4b2056303d10f9097fdfc291f741c0c9ab5fad715b78d9 SHA512 513abc915c526048f4cbcdd9e33f7c10636ecb52a38660f994c5f1d5bc4f8b759304711fdcbb26325f7853f83e75be147bfbb27608b96b3437e6761132f488a3
+DIST firefox-95.0-lv.xpi 459576 BLAKE2B 2c46cb32b99d4fd6f9903c0933b70c6bcedce52b78f3f2f5414e04cef209f06af135aea03d63fa005ace1ee85cb5ed9343fe36cac05a5f70952ad94a36cb16cd SHA512 c1101737b19b663d08c64544a50c5f75b2e134f287fc1cf53df29401847c61cbd2951c321a1d3e81b724dc594575a1351bf3c1571cdf86aa894cf58a5cd1b16e
+DIST firefox-95.0-mk.xpi 460717 BLAKE2B 591b55228c7e572552a21f07d4eaac87548055442aa41ca2fe63e658c64e4db70e314ec4c259b43ccf0302c81f44c058b9d065d8d21950ed716b18679b56d21a SHA512 7e1151e19ee75b81cac6c36f00278981c0f4dd12322b5c8d465811d0931b89d9d6bf012fb43b4943e4b67db0015fa3fa5ac84e792c3a4934efba3c2bf389fbc7
+DIST firefox-95.0-mr.xpi 528738 BLAKE2B e4bac04d0f10d638e2bc02228e2127c56a7196433cdb2116528ca50c423f7064be9adf4c8fd8537c4deded872c7caf187a812b14b37720ba7b0e4a29e1e0c919 SHA512 4ab9e64a1fba744a55b5ac7ec3a614bb6271af4693d806ef2f57724c561423e3f8e6ff0ba162e2c5deacc3d65a58d806dffdeeb8a29aca6f391309c3a5233771
+DIST firefox-95.0-ms.xpi 444663 BLAKE2B 545a6479eb3cda354449669050832c539b75692d35d2e373bc02fffe2bfd19f95c8241ffe1fa1f56c37e0de359c1ff035408c9ce5d81c40e27260f34e34dd783 SHA512 6273fe3f2b686aa80b88d5dc64e07617eb28b1e0a2de962c4eb77ab730cce0ae49af97f33520bbfeaece34afd7163f7d7b6891159360af66829f27aa3aa37981
+DIST firefox-95.0-my.xpi 512526 BLAKE2B 8766581eb05049ee7a430a67c9ae7b962085c4588f35046ac2a10e50df5bbff6947f681e1fdef756f8210908f97cccdd41496fe3b96f0959b3f19cf0bd967d81 SHA512 fdffe4140d38237789c7cdd43e39aaa0e1e411a62d398f792a19724874ee5ccb56de0401b804ce07fc15e9b502d0ad6d3e8b77f1f63ca6daab9cc2399586b94d
+DIST firefox-95.0-nb-NO.xpi 525747 BLAKE2B f48881217157c037451c9d685258ede8ba0f10ae890a6a01700deccfdf2e7d3a410bca9f8002cf313127098a040638719cc2c1dfef73f32d1d3e31311c1621cb SHA512 a199a137a39d56563e5284548fd9012abcc57234570d3eca5fbd648bbccf352cfbbb6671d6c0b16b23b655a26cbbb366318e9b370f6a9b5348630183ee7f1b04
+DIST firefox-95.0-ne-NP.xpi 481248 BLAKE2B 003af761306299f0a3b9633d675298427fc97df0cfad50334621b52eaa4e25de12669478481693f999fa7ba8fe17950bcd644cb8b1d67dc825b44f27ca44fefa SHA512 8ab172cce511c74edc101880825d447c7f86ec2e8b076c0206e91c6a3d6ec7ec8438cacd5da94dd572df61f6da51b9619b053727157319b1afcf85547d4017be
+DIST firefox-95.0-nl.xpi 533457 BLAKE2B 47079b02637c9a3eeb6a22abb09bb48e0d606d23d4aa9b62b05f03049463704665d6d885380bb4560ab55d16d06b6b163869b2843e8ff127827e4cebd73ec03a SHA512 2e52326799609e7c1a17f43829b2ffcaff0888b88ed1182c173e32433abb471da7c2bbba1fc237ca2eea73138d954fd38f0614cf055885e175612dc53bcb492f
+DIST firefox-95.0-nn-NO.xpi 527937 BLAKE2B 172afccfd416591b06f0236e79a99d5c54d96535b37305ceefdb6d4b08f632b6f4abd49a00e4c69ca602ad17bb71edd8f49ff3924680c01fef6c6b31fd59582d SHA512 b97f19e24126047cb51797c2882b2bfb728595206924f9c53ae37bd3ff0cd30e27a88669e4d24f4bd788523358ea650cc792e65a26d6bf8913f5364379fe4332
+DIST firefox-95.0-oc.xpi 549080 BLAKE2B ca7a523ff465b8750458ecff217db8b33866816a704565f4c7646e885d6c1861966b1e6f0d75013da454b1e249f5ced8b8dcecaa36d3c5a579c8c26f444d8a11 SHA512 5d7f2a4440b9697c5b2d9fd2f3c079085420cb2bf1f76e9bac80b8d17f1adfad8b8ab99152c5287efceb22ac26ccccc96ae8f000baf9af7f2f56574f95b8854e
+DIST firefox-95.0-pa-IN.xpi 592184 BLAKE2B 5a03318fd405de07a7874ed2fef380ae103b98590177c9da0f84a92da6599fd48d09bf0e10c60564ab287cb36e386bfe5637d809d02f2aa60fe426f68643d392 SHA512 f04772e873dd0bcab39e3641fd14928b230b315f0bb01471fa403a866e4eb222da024fbdb69e85f8655e7ce6c6f41a88a5616d4935527391a95b6665f76000b6
+DIST firefox-95.0-pl.xpi 551775 BLAKE2B b0fda1de615693a07f81e327f2343eb9e0836d6c80978e6b702ee6edcd48530bcbf7c1538aae146973d3438b3cc89ffd6a4daeb27fc9c3af9b3048d2509871b9 SHA512 b7c144af35ac65315c9d709e047f5dfb64650eec9ec3ac967e031506f93ef9312ff4c590d474b1aa1e3f0c49e7b18e31c857477f316b5960354d5b5179388c91
+DIST firefox-95.0-pt-BR.xpi 538817 BLAKE2B c69a5aac089154418ad3be52dd819c582c5ef04ab277299a843948ed20d5a1df52b7ef275a43888c2c2b11e8ee16112db27c960ed1bd0c500697287d23338491 SHA512 881335de74fd0cf83bda0ee7538f68d7f63bf28a7fabcff6ae84ec7d68e0fb428ccb3c7959866776eba6889816e72be3dd00f7516e4bf8447452b96cd4bf58c4
+DIST firefox-95.0-pt-PT.xpi 542297 BLAKE2B d215211af7b2c0e6aa7d4f40b22f8889d8b242790f38bc913ce5268219280c2b4ab5dddaf55ebb1f90d087c8c6c115292e02486a6a100c0eeeb2ab170c1fe530 SHA512 e861aa28696d03231b68ef7820f3b2beb71d8a441e62d6fcb35dffcd05b25f0f20d56206a3de71717029d9f8654a31dd75bb286606dde20ca91a52524a0141bd
+DIST firefox-95.0-rm.xpi 533362 BLAKE2B 9e9fe73ab0f8d072dfc88b5a5bab11ff27a3683ec9e867ea0a3d478a656b9aebb229f9b3a3f101183cb9481be80297e0e527a71e46b33a495639822064baab99 SHA512 e99367f50ff1bfc5a24d114990b619097922375e86ce706fc1390dfa19ebd9c70617d3b61fdf8fc1441a5aee759b2b4b0d1ed976fd9f1bc8971c39d7acc6cced
+DIST firefox-95.0-ro.xpi 526935 BLAKE2B 289d63649ba197ccaea3002fa0b165dda0cda9858dafe90a4aac838033dfc400b5f0fe17830626e48aab9a0e4184620ef2ab8297d827375b1579ef59548c0534 SHA512 d87bb24c58f5624cf33cd00c4e35a247a2093159243aa3ae2a77e74bd1b2d773a36894d705665ad5ba14ea014cfda5f068a775a76b9b631909533b5ecdf5dcb6
+DIST firefox-95.0-ru.xpi 622429 BLAKE2B 88c622874abb3c2a102edaa1ebf1ea080dde5baae4a2148d79baebcdc9b494aeb4f768264c6f0a1f53b695657921b59a039e2ec8cae47955cdee9be9b93e515f SHA512 048bbba2b8506838f6aff171fb1474e2e41c60519fce8096a43740b11081a17230963c558704ecf4476292b2d7cc770ce659ee6a23cd9c78f8302b37093c88b7
+DIST firefox-95.0-si.xpi 484211 BLAKE2B 6aabb660f7bc8e57edfd22dddb92f82594ea8f307679ea32f8d376bb2ce1c0d24cbb81b53bc0c4f492775cbafbd98abec364e5b634f7cdd990079a97298a1953 SHA512 5a40505ed8bfc9bbeeefef8cca36f911a7e830a8e386100fcbb72db5c79f9f898f899002d8059f1480df279a26565429304540b33750db3253614a205550c995
+DIST firefox-95.0-sk.xpi 562407 BLAKE2B 3a01a8bf40cd0bae4d7b24e41b551cb21c8f850daece989727a88a04711f7f1a1b9091efcc7cf9a4bdc059c00e60d61270617c08a2d59859c73a5b8a807228c1 SHA512 ec4f21d61906c70c96ba530d463ba0a2d6d2e893ac68c818152bb695c28d85a5b70a603279ac3b37107bfae85000d664956eadbab472f52297a90986ac00031f
+DIST firefox-95.0-sl.xpi 534345 BLAKE2B 58eda7c2f9405cf644843ef9f5a2b7ebd23a051a78dc28779e77b99b8c9c52605508c26133e294ca109f7d87fc470498955e7c8d41b4bbbd81ece0b6fdabad8a SHA512 e4623d8373a853d45b7b0fb3b81129099f38532ac8a6048a7202990e59432f769b035ace16be4b228db2a31eca095acb1205627e41a40652feb33456a55be0a0
+DIST firefox-95.0-son.xpi 420603 BLAKE2B d08a1a531523dca9cd8268c7205edb08f2f16a9fdcfe708ef03319d61274c52384ad7b2c9c39fddf85026f021d6f411c9c5e80b21535965a6832beb93f56ba1d SHA512 03f2a58a408bb33c05c8da67508c3244a528dfd4c1763ac8d6f9251e029c79f98075b191ab7937c3bc3f329c7a089d10c64e4361f9028a6d6eab7e47d69da0ba
+DIST firefox-95.0-sq.xpi 552427 BLAKE2B 7a6cb3fa1d5c2ce397c54adcfbb85b83aa9001bf355d838bbb54a1eeee681a1dcbde7d9fd8266bdfb080188cc1091d935fef39ed39d6fc36392405b0ecd5a993 SHA512 0e67147bd01929ef9c0bc00893166332cc2043bb9a1e53bc4437625102cc376b4bd9da91373b480198e3f8c8c9eb05a8aa6774657a18946590d240a148de788c
+DIST firefox-95.0-sr.xpi 582868 BLAKE2B db8768ceae1a9c3a705212ccb77537296e24aaa14199e755a1d32da318d14bd2ef1bc960bd491eb3b88904ac3a4c5d37f3cb683614db3076d30202379da9d724 SHA512 68343edaaaf9ce66267d32545b077affa9eeab5a220bed1f3b08da3db239be8420709006eba56bc1e4e4bf326c08c7ee8f521b6cc6cb4147d11c54a9ec904042
+DIST firefox-95.0-sv-SE.xpi 536153 BLAKE2B 7f1a33176fe5e4e41c4797e5d801278989d58a2e77db8f553adca85e32c86169020540f9d974c17f3d7a977fca2972ee9244f7d2caa997be9b73dca1036f36f0 SHA512 f631df62d197c75ccc645b86e5131c1a3171e755e9009b3b8826fd3e7af90f8d43b974e7079ba6beb5e92c0243773237c16aac17bb559cdf3c4e34929fa68603
+DIST firefox-95.0-ta.xpi 509400 BLAKE2B 04961b9383bea30627e053b512476179f3fe04a3605b8b5813bb09617082deb48a7a971052fc7edd79f162bbbbaf6201c85400f96ceb0d27e806a5dfa7add122 SHA512 8da011875792d71cf80107e96f91dcc1a5f4e7725a2e71e1654fea905345b8023566b2eaa896e160e002790164b13bab989c75b7e2407f590e05fbab74a72df5
+DIST firefox-95.0-te.xpi 546760 BLAKE2B 7bb8a94a2311fdcd126f6d8c7d76c016d42c88ed063f5a16e8dcc633f6a653aed1b3ea2cc850dba4c29abe488433fd1611fb5c20609101c30c1233b2fa3a6b95 SHA512 b955574375fa45a20b55898eebbb1eacf3dee43c55cc3862343b3e21ac9acda9544d9ed116b515e3f0ee8a57c45b553b97f7c68d02ae59794e90df503800130e
+DIST firefox-95.0-th.xpi 602687 BLAKE2B f2af676483ee8918a76c5bb90b1f4f753d9912879f72b0f3cf370242f2d9258c03dd76fa136d039d802336a67ea59e004658527955d708bcfe8a1c3678a6edc3 SHA512 b7987b4e2e6ac604c6c69539e543ba2050342e087363aa1650837adcefb97455bb5cc92fefa0553d7152e8b2e03b6c0c22499ddea1c6fcc9e8e7d58f74ebd33e
+DIST firefox-95.0-tl.xpi 514073 BLAKE2B 04fde0285700502bf278fb6af49d01f95839f34348855867fae9d8ce50bb1e75b2f371b9770f7d9f0d191012cdcd9fbdb2d87df887d450cf7025136c34266281 SHA512 752c4d3faa0bbd1d189acbd265bee5700825c4c006d5bf5343e3aa96747a4eb50aa3cc714eb0e96206e0a81619189a3a0c877c03d8a7598533711e706fe8066c
+DIST firefox-95.0-tr.xpi 549761 BLAKE2B 5bbc39f2a80c896ef7bc16871c4034f3c7ad7ec5ead98b8a5c22b573a34c46e7059879687a39b2223c0058ccb19f3243f1eff1b7484f316fafc905859f3d4b2f SHA512 5a3192201ec54196f1af306339987631d6bb55b5392f8b3641facbac544d1906bff9d5312bc0b005c259dd2cccccce453a2a910e4a93afd321266e08b929d0d8
+DIST firefox-95.0-trs.xpi 487959 BLAKE2B d86920e62b0dd0338964d5bdecedc55f4d43781cdaa57080d7b2314837d52872a101dae4b02a7fcba447e4aa48eec243e986b55b38a37e1c228a7cfb8817ad91 SHA512 de92ac2cfc8c9f2ae90506ea22720b3914a3bb63822b1f6daaf544130eea9055e3d6d498b02ae25c3fddc1e06512c95d5aad0206419582bc8d976c5e058b3d5c
+DIST firefox-95.0-uk.xpi 615803 BLAKE2B df477a4f9badab9e8c9c90a634e7a3937da53584ce1dd4d6c08f6934de93ef4b62d806cbaf9ef50c22c528269dd3b352607c1826c96ce93708c002cadaf38ef4 SHA512 1650c9cc066303ce1c40277f47c06d05e372e0df9dd6c6944549fa3741339ec3c4c4e6ba5b64162997605878d897e518d6d201c2611fa1a9e7152eaf77ff116d
+DIST firefox-95.0-ur.xpi 554230 BLAKE2B 9ebf28b6630c7ac86c1d86617f118dc55160d8b979aed4d5041340b025e3b2d2db8ebb3a15af579f3410d8ebf7ec4b18fb6a3e98758d14eca7f1016736f10279 SHA512 32299a4dbc0a7109f6e520a4cc0d3b69e97737fadc6ca8313fd23b9524971f1f78b5c214a4eb05b2a3705277e4b14a538cc1394b65e00bb5479f9b233cd966c9
+DIST firefox-95.0-uz.xpi 463752 BLAKE2B 8ddfa67828ca4865a6be32024492d23ccd5212bbffc1cb0533d99849eb1fca7356e355cb3b980dd0767232c3d78a71bbd7d90fde5e5318d7be05c118a3023781 SHA512 d5cc2d8ca356a30af0362659352d76e4b4bc666a03533f371a3637f158cfb28c6aafef76f9fa0b238d5875d00219e5029abe13fad56fd189876ea04f2c204868
+DIST firefox-95.0-vi.xpi 569408 BLAKE2B ea2d973c250c3a46621567bde9d6e9805dc2231569c8431ae28a3eef4ee1705ed1e48a4cbb1e1d47b31b5899fd4767b1e7e11c989c17a006dcf8629d95870e9f SHA512 304fd402b2be4174a954545c247269f66f716722eae6c3e299dcc8299f0da9b1daa2f637fd3bf2dc0c04218f493a91952f0f3f67d010acca28e969ffbc4cd102
+DIST firefox-95.0-xh.xpi 424123 BLAKE2B 35ebded6af47343021066ff726501b1c5a36bf96c2d2805883ea7f0c27820807a7745a59c9e5a0ae7d0697935501ebcdd4ab26d4bc4ec27900d02562215331c7 SHA512 9335a43b2bcd62a8521c04c1698ef021b839b124a20c00ff8a8c3a4b641273fcbab5938b8f207fbc94e26c03a05e4a213f2a43e64814da1114178951068d2c66
+DIST firefox-95.0-zh-CN.xpi 571142 BLAKE2B ef68a507ae28c7fc9fdae15a3b2f760ed50889245dd3a3c463f170642deb14383feb0bd1a7dcd2806b6c88aca14101b0253879ddc85773a355667e98f8fc7b47 SHA512 006518e8c34db43fc96f371970737751df6a36b95a89172d2934f776c3eda3372cc4fcf674fd81b8a9f4471fe2be7a212a725ea9772dbd0d82b9a1fc56ba75e1
+DIST firefox-95.0-zh-TW.xpi 571955 BLAKE2B a41c01347771a0fe5609ebb61b2046695d9354c35f61e238db116401da8b8b50c31b07ee8455347f6f2714a2ad3fba5dacdaa8cc4b0794e90db16c8ec30741d1 SHA512 68395d78cb17ad8c9ce7b70e23b5f019bfda25e6aebaaaa615babfafdb715dc3c83cff049ae8b9d6c3520919a8fc46cc606b136276af1e86dfb5e82ba3978e7b
 DIST firefox-bin_i686-78.15.0.tar.bz2 73406738 BLAKE2B b08ae14ca3cbe9d2a7071d77df30cd29c67b1ce8b5898d7c315e399bd42aa2bc8438fa1eaff73df5b348f6221687036266af531493238cb27473c069081c0070 SHA512 069b0faa92408adc319527eb3d6cb462f122156a507b3c646bf9a467fb49e5f2b48cc4a2d1dd7f55d8b7f2c6e279d3768100a668e95153ac6467fcc7ff8f94b4
 DIST firefox-bin_i686-91.3.0.tar.bz2 78790051 BLAKE2B b787a845f07ad9b656efe7a94447ee457717a822edbf737100ceff0257f9879527d228879c37a86128f9e0722f0729e4705dacf5f55d7a93635dd03589b1897d SHA512 40328cab4a808f43ce5caf9d2f987492f1c4ab21b0a9aa4b17af334fbef081a0a8dd9cc491b0e0aa972a042d96b41ac6b8d2f195e5c42f71d7dd8ff56e415a38
+DIST firefox-bin_i686-91.4.0.tar.bz2 79024386 BLAKE2B 96d442acd39e6881d6cc2f355e722750e229c9d65046897fd12569582c490307aa510954a8698f50f9c64372a669a73f11c7f38232c856748d5793ad7ec9eea8 SHA512 48d4fa89d5d5cbdb459a4b99248b0c258199651909e7f9e61a8fa0cd83621d51ac9066e0365d9e21e5c8aca397f61eade5678e5d12c602711786f4302ddb5522
 DIST firefox-bin_i686-93.0.tar.bz2 77199708 BLAKE2B a265ead5bb91406c8db4688709cb7bdeffaa48e0d0e20daa93841677c2e239148c0e1da284ce56bf3a479f5e5a878bca7cc702804865073506e27361d94b4642 SHA512 1efa973447933eb1e233f96201b64b02aa3207336e5ad2581ee00408a0fbd8b6461d16065676cf784fff2d199083d563f280362d6b0c00bec76a97e0e5cb9b32
 DIST firefox-bin_i686-94.0.1.tar.bz2 77792411 BLAKE2B 09cf5b66e5710a89d0f268dba476445c392c7e17d9ee6ed682033f6abc5adeff959f182b04f20cde598f8d9fb2cb84f5e84d7b7a5f183e7be366f9c79a754697 SHA512 baafd45ffb88a1919b89137e4f56f3e17fd7df56ad7407ee35f340c852d747ab22a93d2b80fb2152aaebd7241586710f2f1b9e7b056c42c856a3ae8fe4245a56
 DIST firefox-bin_i686-94.0.2.tar.bz2 77954283 BLAKE2B 375e9b407a60ad7939849b385d44064e09e865b2354e03288c5328a8532cb7298a1b96200dc516de24ed3866066d5d3b213a4b6963ea2bd09b63aadd62e8ffc2 SHA512 eedf17c71caf8d44eb891333619dc93634c9ae93f05bbdada3fd25994c0947cca9d8067f7fd4dbce6503ae7e793b216c683bcdc520060f99bb970a3024e42953
+DIST firefox-bin_i686-95.0.tar.bz2 79018771 BLAKE2B 1f671cc6fe2439d338382c8d223353ee2ce457770a47d659540025bb38b40d6a677e1b1bf7288b00618646335ff2ec60d909101311e4580bbd21757fd4fcf4b6 SHA512 3741415d34884a0087f0bbc803e5c8338f73a429c8a89276f231814d3256d60ff4337783b13a33ac286b3b8ed828a5cd046336f6500dbbb62ca32f7cc8f47302
 DIST firefox-bin_x86_64-78.15.0.tar.bz2 71155495 BLAKE2B 7ab6b6e892d78778136ae83434269a77238a274dd369a5cd659a6cd6068a30be93eb9f023cf2c9fd5c4bc31de57c256a86d48b9c4043f740f72847fe032574e2 SHA512 5c7bb23a9003f4e246a40e54613873051a640ae2a69da60a241e48f8fe413095c46182a8626344caaa3efd4620f9100c2656967106056aa5db9a646fed1bb57e
 DIST firefox-bin_x86_64-91.3.0.tar.bz2 75998026 BLAKE2B 2c87cefaeaa9a2ec69168cafe6d7cb125933c7cdbc1a491bc1d829d5c1d258596e938bb1a154948c2a74995c6b7f4250e37000355d179bb32cdd91686827de33 SHA512 7388472feea9d5c45df7d324f1485aa125e318a442768909ae24c3001abdb2567abcf3ccab9df2d2b5f90d769c649e05c15ba428a529c929829b8fb254c24a6a
+DIST firefox-bin_x86_64-91.4.0.tar.bz2 75962752 BLAKE2B 8986592e6972c692115d9f3701a5827198e31d00cd1e9be6a4f919793752c966c70e294a290d39f19ae06f3a25b722edd863339ee3746718a75c847373c73579 SHA512 e551c36ce63695ad6f1084058414f484134cac6baf26f1f1854a6552c84cf38094b2a0d9154a248e755736cbbb4fc754fc965b3143111dae5f90671c4f3fd111
 DIST firefox-bin_x86_64-93.0.tar.bz2 74008444 BLAKE2B 6cca65f02207dfc638ee37ac122b1af4e821c05b0ecc2c5861eab6f38fc6b68a7d23ae7aeff44fcb433a79f46d3e306e5c1f228db06eaa33e30a52d597d9caec SHA512 33d5a98ccd2fb33f9315b9d89797b42ffb67610cfdabdf383c0240ba1eae203715e543021e8a59908e14e5a68a884b455e94672e222b2534d92eba62adc30eb1
 DIST firefox-bin_x86_64-94.0.1.tar.bz2 74670989 BLAKE2B cb5871eb3b946b67e9c0c13bb2c26669d2be60e684bf62124258525bd646c15cd5d4c3ad86bebdfc9791830db2215faae21a35f1c1b3929cfbca02fa48a87840 SHA512 f5b00121cc465d76ec2a399aee1342baf42ad6e366963cc88fce65337368d995859d76d4ab2d42d0f92d78256059c899761c022714e0423eee25426e0d0dbaaa
 DIST firefox-bin_x86_64-94.0.2.tar.bz2 74771512 BLAKE2B 567797212063f68aed40471b125baa91fbb364f85410b2f81cdc5a03bc383d548284d9f479e7d26211c560ec0a66df2a3a86a5f3c761614436676e41368603dd SHA512 49c556fa337916349db21b6a01f67ce036be19eddfa7842f01af4c2c296e27c36217df5f398846651e83f612c5680acd8a7dba2cbc50d5cf189e073fbb82d854
+DIST firefox-bin_x86_64-95.0.tar.bz2 75181051 BLAKE2B f3ead1c7ad2051ee208d5edd9f7cbb76f7be63397a650c04784a54a07f5d72635c0785b92a98fdfe2ea15b794d59ef3a43fe965de92edb065608af2286dd953f SHA512 30e7ed415d5f62d4a27b7e551c8a993b8cf8ef8ef3b29702ddcf0b67763f23a606c0d9447386728f76cc0a3f2082d1ca6915d5c7ab3bc5f5d94278fcdacaae11
 EBUILD firefox-bin-78.15.0.ebuild 11540 BLAKE2B 1c49df21f84cdb50ac72e1f246e9d8ace457609f39e9e8b958bd6f488df8a2f27af21449588bece5a6e3552f2e1b4e7adc7813e88a23407eb9c42c99c6662382 SHA512 c42081fe1315e4d8795bd4272c383d0e3c2037fa9adc5316153a124076f3b9e5eb1077751287fa0ff5cfc74d869953fa6226bba3b71c038513381e7bc44a4e55
 EBUILD firefox-bin-91.3.0.ebuild 10926 BLAKE2B cc1983720571287eef98579c66da90f0bed427c3e8e4842a14cac0d0e00a87a1069049f6c83782ba170c49cd19a8088021900527af655184009af3bb1d56b412 SHA512 0d3c3fcd1b3238cd754f6ec0698e391758f418bc6c8ae7381cf700fc0350ba0226b5fd9659ec82243d3967ba7e602f1b87b18011e0ac3e42573929580e5677e3
+EBUILD firefox-bin-91.4.0.ebuild 10926 BLAKE2B cc1983720571287eef98579c66da90f0bed427c3e8e4842a14cac0d0e00a87a1069049f6c83782ba170c49cd19a8088021900527af655184009af3bb1d56b412 SHA512 0d3c3fcd1b3238cd754f6ec0698e391758f418bc6c8ae7381cf700fc0350ba0226b5fd9659ec82243d3967ba7e602f1b87b18011e0ac3e42573929580e5677e3
 EBUILD firefox-bin-93.0.ebuild 10850 BLAKE2B e64eeeaae24bd52bc0eef64ecc869f013fc5444260334ccff42874ab051be44ba90fc8bacc7607d62a22fc8704dd5d13b1352c0279ab8c7d00235cdbbd23156f SHA512 15eb32c11409553bfbfc0cc162594a84d97629c9c958f0d43c303d749109f2b5b7cdd95c18141fdadbb4fa7d45ebf165151483e91a53224c87521a999cf34eb6
 EBUILD firefox-bin-94.0.1.ebuild 10924 BLAKE2B 7455d49d667f167df2da57b9b718eef51540860a38358a5d83698aec848865a65e6a9d74d0faf84abfc0db2d995e4752b95b0539c35e4a4104f13c2dc588f93f SHA512 15bbe4646d35bf83ff04018ceecf291b7a389cff5a27c17876bae77719c3c3c432ca34e699e31edc8cd17679b5b33c866bdc74844da7db3425b924a153ae32b3
 EBUILD firefox-bin-94.0.2.ebuild 10924 BLAKE2B 7455d49d667f167df2da57b9b718eef51540860a38358a5d83698aec848865a65e6a9d74d0faf84abfc0db2d995e4752b95b0539c35e4a4104f13c2dc588f93f SHA512 15bbe4646d35bf83ff04018ceecf291b7a389cff5a27c17876bae77719c3c3c432ca34e699e31edc8cd17679b5b33c866bdc74844da7db3425b924a153ae32b3
+EBUILD firefox-bin-95.0.ebuild 10924 BLAKE2B 7455d49d667f167df2da57b9b718eef51540860a38358a5d83698aec848865a65e6a9d74d0faf84abfc0db2d995e4752b95b0539c35e4a4104f13c2dc588f93f SHA512 15bbe4646d35bf83ff04018ceecf291b7a389cff5a27c17876bae77719c3c3c432ca34e699e31edc8cd17679b5b33c866bdc74844da7db3425b924a153ae32b3
 MISC metadata.xml 426 BLAKE2B ec2aee77c3aab786c96234274e5b3b38515561dfc66dc8b844f0c7eb8288e4ed083b968b43e37f8593877e729e7a9e22f9761dfd27d5f998de21f1f67600559e SHA512 75f5b6e4ec2ace6924078d31b3a836ba11de1f73bb406416d222149a7407d295c5dd0d64c3306b20bfa76b396a7b6a773aac5b91163716350003a65d619f5691
diff --git a/www-client/firefox-bin/firefox-bin-91.4.0.ebuild b/www-client/firefox-bin/firefox-bin-91.4.0.ebuild
new file mode 100644
index 000000000000..399ed9b85f1e
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-91.4.0.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/esr$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${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_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/firefox-bin/firefox-bin-95.0.ebuild b/www-client/firefox-bin/firefox-bin-95.0.ebuild
new file mode 100644
index 000000000000..dd4f26774a97
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-95.0.ebuild
@@ -0,0 +1,387 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop linux-info pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/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 )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^} (bin)"
+	local desktop_file="${FILESDIR}/${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_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since firefox-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla Firefox shortcut."
+		elog "If you still want to be able to select between running Mozilla Firefox"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 13f5c6440517..a78372bb3160 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -204,7 +204,106 @@ DIST firefox-91.3.0esr-xh.xpi 435358 BLAKE2B 96c7c7f452184145ef154126b6c2fe6216f
 DIST firefox-91.3.0esr-zh-CN.xpi 583248 BLAKE2B 3caf831df6288ec5c1025f20c1834b6993fb5f50349d9b8715e6e020ebe5e1dcb0bf62592f800e03066cf1564a8bcfe0cddc8e90f72f6d7e3298e1ecc97c71b3 SHA512 95044ccbd6ef200deec8e4d3143a3989277fa309182248d8bf3941c25778841243f525410c391d49aee33a6bfc9d6d625ea45ce96ab7df9e2d70264ce1a3a438
 DIST firefox-91.3.0esr-zh-TW.xpi 583430 BLAKE2B 848ba2ff85a16105153a1810594ec9c76f4376aed110a896cb2de21b8a98574ed6d8ef1b5b290a2c650cac072e4bc7420405263595225170d51682fd5a0b8fd3 SHA512 0d4ab413bda98207f76d4b8ff5f895dbe2e42e67856a93027de18175927e24f7b3d1eb4beb6c1902f2dbd6bdd4e6e3ac164a7a1061de77acd43331b1dbc1d68a
 DIST firefox-91.3.0esr.source.tar.xz 381117132 BLAKE2B 316ac4c7e673eb1db88da9e7c1ea7eea6c3f6b6ca4d4066100c165512e52374c84f637aed1fd5037b126ce2cf51945a5a6276a4974f557ed1da7ffe1674135f2 SHA512 7cf6efd165acc134bf576715580c103a2fc10ab928ede4c18f69908c62a04eb0f60affa8ceafd5883b393c31b85cae6821d0ae063c9e78117456d475947deaa9
+DIST firefox-91.4.0esr-ach.xpi 451228 BLAKE2B 525aac7e80d504b87a565f045f6ffefb5b8743d9f0606564d6c10dd2ba6ede526d451bd08bdf9ff4abea578f55cbf7dde1c0542ff8ac3640c3c8bda920d146fb SHA512 42be3bdc43b561b2148fcc08be8c4645c6ec15ebc1d689489f922c31234df2a88fa1dd481b7d8122c822b8487e2d1cd4e7a546909000603cc1d056afa83ff5e5
+DIST firefox-91.4.0esr-af.xpi 425096 BLAKE2B 8af222eee5d909eeaa76168a1601e59abf870e1d351b49495074c27eb12e1fe1160293aaa972633002a9e9bdae02a555e395f962de8fd9283ce86556ac73d6de SHA512 1a82f635d36a646973b0f08b1746bd476283f6e807ac31ef9fef48e59130367c7e138ba92038f7f2778c8f4455f9d6726871bbb9d563495b68b0e3f72cf1bd02
+DIST firefox-91.4.0esr-an.xpi 497865 BLAKE2B c4903662ae08d04a5193f4355ab273d09b71fefe3ed69f93ee80b577ea76ca0ff1921f31c8d4de852569a41d6eef54ae039d6557437761fce42d5c7babc632b9 SHA512 35da11f247f7180e2c5e720a1989d57bf575c7c8844b231c38b598c0df166891b9fbc86360fe7865908eee7f4119c037664f74002093a056e601fc65634361cb
+DIST firefox-91.4.0esr-ar.xpi 557243 BLAKE2B e1f4dd28e26227ef345673ac6b69eccbb3083d619fe0ad691586f2c132912589552e3a2d463efae30ac109d3bcef7a2b94aba78b0dd89b4a1ddec9537adb2e14 SHA512 cc5e9e60cc65314fef7c6b001a773f8ae7763342ba2979606dc4ef3efeab2af5cfe0443c953dd0796a2cc4f5bcd4671a6223fb921559d455794ac3c2606751fd
+DIST firefox-91.4.0esr-ast.xpi 496964 BLAKE2B 6cd56181f48260dc85982220d32599c5d99fc7607ee17cf607976d945b8fc04217e9bb5ed150db6e8b0d691c6d219f9adbe9e26fc52af8af106b1b635caec105 SHA512 619f8f5d96d325a068cd27589de9cf230be74b613d8cb983e4833cfc59641b5e716a3d7f1ea69027e1baea4ab5a34f21f836141e5bfc4d8257c8d81077c29804
+DIST firefox-91.4.0esr-az.xpi 487259 BLAKE2B 533a12abce11c5d39eb21291aae74efe0ca1a77a2169ce5be11cc64864b1cda5b28f04153c1f0c1c368b5183b248aca9596fc0c8e19466a5dc433ea5a54cdd54 SHA512 ea239697a214b6756e091655608514f3746a6ac0661cabe0241004d90854baf7d0f3191de361216dec70db00534bdd432495fc45531c1ba1162bf61d35ad4e5f
+DIST firefox-91.4.0esr-be.xpi 617852 BLAKE2B 0e9fa980b3bc459e3b9bb7f3e63c6c3b21a2ae30995412b62dd55d2865c5e8144d5bb236a884680839a227e2e5456b107cb4c39ef1220b6186ab8ed8649eb170 SHA512 848d39d99f72bdc0b470c9e0a9a347edc3a661a43342e68085c33974bbac0d7085548fadb391fa4eec12aa24d4e577e670899d503a70bcbd02d83032b4d6c8b3
+DIST firefox-91.4.0esr-bg.xpi 566071 BLAKE2B ce4def1ff088bba14618de255e33dcafe2c0e1116f5d58166361f1f8a27a7c608e5ebead3270766111598c2d43ce5a9b413798c4aa722960bcbd7da07386538f SHA512 e964a9ca742de974334b5f9a54dc3a0e6d7488a181ae7696a6130e2307d85cf1d39307ee4442bc663dab7a9a4d1850117a5eaac22e670852cedde4a18d2e0c46
+DIST firefox-91.4.0esr-bn.xpi 554437 BLAKE2B f0b7e820e5a06f9ba829fe61b903d8d363eb4793f8ba7463096ea9acd68abab500465c52ca9d577fda0b9f36eefcbdf62a4811be15abe9e2ed3af752853c5980 SHA512 95bed68b2e1c2954a8447cf5d782c9e650bd06e522163341890aa7e751ebd906404dfa8fa68e66749c0a69e5a1a17fabec827ecc0fac2bcd3db5ed4cb423346f
+DIST firefox-91.4.0esr-br.xpi 522501 BLAKE2B b2b2e43d3d6a0dce53b8fa6329951bb3ae14513a53f42078545c1bac0b42ed3854e367bfa9ddeeabea995c6f0c2709150dfeae474b6c9d22465057ae2c6cfbd1 SHA512 f4a4a21ccb7b7609dd7050f5fac57834b3806916ae2fe5a8d46dfea43715a80387ae776edc84cd151b2913ba0b3250896b2e0667dbcde5501873512a9897db26
+DIST firefox-91.4.0esr-bs.xpi 461651 BLAKE2B 173ae71acf7d349526871b71a17742723d5ec4ca8a4e4786c7e60611579aa1dc2d7d3aa98db263a0d6e3e9246b45fb1f923662691df5c0e7b9bf4119abb3bc5a SHA512 98227011b4167c3635507c1d3984854e049bc12f7d9ac27678bcc8c3db2c00df461d1b937c30e0ccade7fb90cff10ca354be84050f63730b05e6261bedc18c5e
+DIST firefox-91.4.0esr-ca-valencia.xpi 527261 BLAKE2B 08da181d15b6859851f294a97548685797e6de5a954615990bae0fb0de0f8a8af4267516397e7773e6d239734c12dfeb5c3597ed66e917cdd35b7ee929a27522 SHA512 e91197cff0a966fa294f9e7027eff1134b196489ff5ccf943f3c91a0deccc60a9b4acd02e932074196e5fcaf3702453058aca1f5efe57766d44cd21a7ea35082
+DIST firefox-91.4.0esr-ca.xpi 527631 BLAKE2B d759ba35fe9940a21ac969b9386f236ada30b5ea4ccfa702714de5aa2310a150db48a2dc5e2c46087e4d0d2abb51e60672eba9b9e8e941d3c33d2529328c13eb SHA512 2abef3037ba8d26669d64c710acb681136794e9d51c47f25dcc8d668e8cae65b708b072569379d6c272a54ba6027212696ac31777d79421eca3acd0fcbc75b91
+DIST firefox-91.4.0esr-cak.xpi 550924 BLAKE2B d41287e5d63273e97ba55748d6f94462db7fd0508be4bff7d59c7e79504f7f173826b891e52355545edc9110619755ab5b8bc635e65d2019d012df7185fba24c SHA512 86b021881ebc4bb1855cfc52509b16f864314947d7122da415ce057dc7daf7a3d4aa9621ed668152302f9eda1250c7426a8df9a717d92f7d1591097c4aea6c55
+DIST firefox-91.4.0esr-cs.xpi 559274 BLAKE2B a8e0f05e08b85020a70ba313ec16a4cdbe2e1815070449485bde0436750e42ca39bb1d2b530cf4c69928ac96a37f24868ad5dd09182c627ba8916cfb1eece052 SHA512 2a706df50f8245863b9d66265055c83ebe2fd8e19e2ec7f203aff4036025411a7c9163cf60b6f37e042d3f11cb5b4b3de920de2b26db9559525339261212201b
+DIST firefox-91.4.0esr-cy.xpi 538234 BLAKE2B dbc2747859d76eb542c30719364963b112e0643592ea6ebab75167eaa5db5f5c62427d601c3bd2106001965e988b098191b2c53b7be1a8237dbe3375aeb56e91 SHA512 3a4fa4f2a52bf028ba8b2bf370eea3ae0a0a50fe98e42eae8eed8aa0d5c828aabbf72b21a70dc99ccef3b6ce59956e01a0970b44bc9cd82cf3f7d30f48f9a898
+DIST firefox-91.4.0esr-da.xpi 530228 BLAKE2B ad7891974d63bef156efea37a634a53548fc924590c7caddc4df1aad12541f2052123aff1656064e38743764a6c5933b968ae750831dc5b7686f42cdc64cb7d2 SHA512 1feafd2c5af269318109e11f47bd1dc30c28027b02deeb2910c21e84ca988c0ef6e5b85adead7aa73581bcdc861445899996e61b370a039355bf15d63ea3309f
+DIST firefox-91.4.0esr-de.xpi 549363 BLAKE2B 8660c7d0d22382487bf45d573f93424706b07b4275e553e00faab26debaa156309918983b18ba60710b5694da7628c8bad89a92709f67303f63fb4974cf32143 SHA512 badfc5b13084cb6938a08e403fafbe128fe62f3eb799754b89037204f72a254601073d46b10d614f120ee9ae834cbac63ef6d2b2e632a1dbd29d8ba466f6a00e
+DIST firefox-91.4.0esr-dsb.xpi 562054 BLAKE2B 03ceae4f7c0b21a4a73ede81da1d87f28b36691ecfade984e0150367faec8397ebad2a53b5709105afd437fbc84da1673259993cf9c95c415a962db827a96a9e SHA512 bf46da14c7539d4e69a2a4ae9e11949b9013798587ed99d15831ba8e654d1d623dcbd26150668839b06196e24999b7ff6cc8f31c0c664b6d338e8423b813a26b
+DIST firefox-91.4.0esr-el.xpi 634551 BLAKE2B 4d6d237e1657db12df1d13887d45c636e0fbadc79feb9c27a16243bd6157c5b7f7d0c1b1cf29e05d58709c228929c0a4d2c4732d4c1d0f844f11606c50243494 SHA512 433003408c24815a5e05e0595a21fb6b5f1710cd672b343f9a708299e8c61f621d0b01cd9895610fd87214b6108ccbe9efbf8053a687b669d60864f69c45b2df
+DIST firefox-91.4.0esr-en-CA.xpi 506461 BLAKE2B 499bccc90ee2ccaf44fd82292ef193223b8ce0a8ee8714694d668fc52a1e550dcd90d75455810a3f167d50060decd5d491660f4958847872f30211477fc53329 SHA512 79db782768da33dbdf707d8e67d0fa361fd7651576b7fce5ba55fcea9d5b36b20961eb5564ca9f54dbf5dd8d21f8b106d1b7fcbe7b6e6c4704d54f9c0190e579
+DIST firefox-91.4.0esr-en-GB.xpi 507019 BLAKE2B e1143c3c00e0ec03be030b12b9988b7ad088fe2c833524b796ad4ad4e0a2e10d1754b217dc8e2bf280b1dd92a4a8f9cee9fb55875b6540847591827a0f687e99 SHA512 53cf821d5413f60c13e50cdaf9244b80c4f4783cd6bfe7c7c340b99c0d4f1f479950affcabca33db1d28da3302e30b157e78e972384b1d56eba06043c06d6d64
+DIST firefox-91.4.0esr-eo.xpi 528486 BLAKE2B e5c361e4c4fdee20d33ece92d5130f182a5af860d916040463e8292f14799bda0ced5da3cdd09844a85799e5991d9f25721e60c4a8e9b0321028d2f25a26085c SHA512 4c93457f3276f66d442321454d9ee020ab24966552ceafa980212638379a15da213f9bd08dfacab104803ab1258f3e3fa92c6f4a81548c7ee973871151900175
+DIST firefox-91.4.0esr-es-AR.xpi 542781 BLAKE2B 661c003673dddce5ca3cbddaf6a7166f65ddbd62eccfda55fd6e110ce2ee416d48a2be1522bd298e64c54aba72c8e0b55c233a5da46551970b1553c78911142a SHA512 cd7d4c39b4b010dd8c17497450297b7c3f8ccbbad1bc5b598700b88e4432c8c6a4c07652fe4f818b6c58028fa243bbfd987436ea9749303fe6e33da5756c68d6
+DIST firefox-91.4.0esr-es-CL.xpi 542423 BLAKE2B f620a3f923167105b6222f4f814bd16a3d39c791e91a034c10c4e2a74e82231ef11f967d4d10b74a51de965825b3d95213c0a4044d500e0825c22c74def52b7f SHA512 1df5c356c657bf009c0702d178c0a97ca6425350aefe46246d585bc914f9e957d45be2b8f098c79aeb6802c715879faa3c9ebda96ce1a1855151d0f031ff9c27
+DIST firefox-91.4.0esr-es-ES.xpi 533117 BLAKE2B 645808f4c09423f43cd323eaf5190259702fcabc29aa816a3eb64e63394b5571e0c4e23a87a5feb9e79145fc3d2dc6c4e48d12fa2f0df199690f8245aae877fb SHA512 4920c49813d2b996ca832f452d51226365bb39a44ac62645e3418749fbdd08e8e5ec8091eb9108e9039206d434091be570aa71cbb9732516752cf616b4465dc5
+DIST firefox-91.4.0esr-es-MX.xpi 541516 BLAKE2B 457044739b4f864c7c5647056c4b31eacb32d79296488668429683a33f7a4438b13a8832763f9e7628ae6094d8b7dd1ac72944d931e96a0e4a1a6883d5cd8878 SHA512 79b184125aae7311195d268af0d97aa274c9d26d8fd1d8b557db9860dd8e5cb17a5307a39a22be150fec18adc69649dae5e76922e9c46fe29cb32a6bfef8b46b
+DIST firefox-91.4.0esr-et.xpi 480346 BLAKE2B 5ac5375095f433be0d2d474c7ea808f826c2123b82ebdbd541bd03914972b4546c940f1334711ff16c75b9d07ef179bdecef8aba80b02c0350c4696d86655530 SHA512 d86bee23f2a22a09b8cd331a3f1ba3a17a3509c1941af64111d604895e8ae48c0ed36daaa72610037aacd039d2e1ae80a08182014163cb054a57bb4bd3c99029
+DIST firefox-91.4.0esr-eu.xpi 532520 BLAKE2B 88fce18bde87ac875adfb43fa5741ba2ff568f0ce8c1260c474d3f3a7af879ef4af699ee8a6b24d99aa6228dacca67b7897e9588f2b4c30679fe37bfcd511693 SHA512 c1cbafc7a7f2c462d7c2f43b830397dd02f9b6e12c01e45be154105b36cb62e56d18f662086dbe4127d91927dd5980157dc90dd4a8bbae8a663beb42dacc7a47
+DIST firefox-91.4.0esr-fa.xpi 553970 BLAKE2B 568cf1029ad7150c72f06adbdc80ce16235f6905fdd7545ab9aa8b5923b5f585f2e2d889260b5ee3cb30f6a0dfcbc24afc5b2e7307055dc4bfb02e735e40d640 SHA512 6c0d5114943d27b4d8b50a99235d6e85e6674a810e95c1999cd2061cdb9a7f1f63444857fe69d893a864a3f083ecd86fc4641d59edb9b15ec6f1287feb2a13ff
+DIST firefox-91.4.0esr-ff.xpi 469973 BLAKE2B 6dcbacee6086dec58fc2b619004cd505eecfb20ac914b2592c6e18864b4c016b535949241f1e8e806ef7609a3534c272b0339a701ca07fe92aa5e0fa2c7bf8e9 SHA512 3250d9e7c14370ad5379b081dfc4831ec5c4db6361cee3014f1c31d0b963d82da8cc5895ee8793d383fc508e0d78fb289f592f8dc1f75e1e70b61ffb6218111e
+DIST firefox-91.4.0esr-fi.xpi 526622 BLAKE2B b77cbdf5370e3535a3352cb956eac60f2f3facaa6f9934d6bd75d8570b0bac801a9f56cb44044974b9669595c54dbed95e48568759cfaf0f853f8fd89fc3b91b SHA512 38d6d9d1243ff26fc588b984114f8669136ac7e78e421d1dec0ea6bd12116ae49d85de5f3b559f21b0510c01a203cb8acc19f625047e13fd5d79238832a2af94
+DIST firefox-91.4.0esr-fr.xpi 553503 BLAKE2B 393c700caec3ccee3ca5e679f63b8463461750872c54090d5f619501ae4dadf0a475ca47da1dd7efd80335854b094d52f08df7ec4939a3978b7130ef8875c840 SHA512 fef38c360e58008da3ecfb261fc8cfc904fb4512159d4367e7e3d08173c1e675d2fd9a5ee0db5cf440f2eae18314998515a0fa1e78c855ec2b45cc95f70376fb
+DIST firefox-91.4.0esr-fy-NL.xpi 539366 BLAKE2B 618c96d6156799c5744d311368d7b29edb79887c6997260bdf74bc3ba6b6452ce7fa76265965e78732bd746dc19bf1512e7ddd9edd43dda9faa6166417cf6274 SHA512 062d45aa56fda9e7e77d0badde5a519190fdc804dee5d648d9d2ea75174ec6412395784992b50ac58e79d821492b248e6757f2c99c63a5649bd5bc52de74973a
+DIST firefox-91.4.0esr-ga-IE.xpi 457892 BLAKE2B f3f5c1ea1c1e122a896bf88774f8b76b8dfe48183c8896f5c64c705dc1ff0283a2f17b534301f4dbe2b621b5f6f6251d2085b28476ff21aeadc1cd15d9a14378 SHA512 e5aeb011f6e6b5adea4c04b01f994a6d4e3b4d368fd8a1efefd48fb631fca757463a71f2c3b519af7216ef42d540367fae3423e6e2dea038e51075c10b4c7b33
+DIST firefox-91.4.0esr-gd.xpi 529204 BLAKE2B 2d61fd5f3c221dc9ccf9a72948d28a9615c6d920989ede46ff888bd0f63754eef7db995d3744be398249db8aa7bec0d37f61c58ea1de016d4ccbb62b471ac58c SHA512 62222ade8a1ab7a60168040c25929155f5e9a6a769d40885b7f6471bfdd523457e09cd4810227dee5dc97092fe2862a66af62843a18a17be8cd0cb4d09116e6b
+DIST firefox-91.4.0esr-gl.xpi 537265 BLAKE2B f3913d321f6abea828a18f774e475da4d9d91bebe3e596a77719216ffbef7602a10c4501d0fa6c1ca1404c1121773a9cc2b4d8b1c02e20d971ea1516a05fec3f SHA512 1f3177618c182cec06c9c9d69efb016dd09ca80dcd1a809a5308c32e32737a3c18170de3f9f88b04f71a42b2090051c6c62f8578ad55488c5322e9667a0b1301
+DIST firefox-91.4.0esr-gn.xpi 554090 BLAKE2B 216907423db0a9ea6af0003cda1fa12b6b44fbfbaca7b71d241e9e05365e07ac99b2b2d8654937a840b4747a2916228edb9e66a56203e3b19e8fc4fc41daef6b SHA512 306e3474f30cd22e52e17a7f338f1ce28b2aa03cc8129eda8b24cf379d686068bc93cfe9c3cbbddf4e60fcb278a5c0c9cfa443fd4f34bd4b6bff3f924a6cee1c
+DIST firefox-91.4.0esr-gu-IN.xpi 527245 BLAKE2B 2dc7bff6a9a8117907aa0534100cda919926191793171b0e35dda3e3e0c66d7768ad77b24266de265b5a3dfca206d6c3f968870b2184badb71d99c1b0ab9e650 SHA512 ff631f7094c1d3d496a18bfc9279424f8165f2d3c0e9eb40a723e1f586e32602d9cd387cc4eadd6bb0e7a80996b94e5e9a774e4f2b010427cd26efcacd4fa947
+DIST firefox-91.4.0esr-he.xpi 553037 BLAKE2B 3700b0298b76cceef7a2363e1e99c9ca16d3e778def977f1f7ce93f3f6059e4f7dd136773a3e77dcca18511920f078a1f763d111a616e198bbcbecf9ab155584 SHA512 70e5125db74d1427d70cbb5e68c34520a960874897299eb35ef2846123ab82b737fd71d32adc92e7d04f632e4ee8b64a154aa0f8357a9ece277ab7669df717be
+DIST firefox-91.4.0esr-hi-IN.xpi 554560 BLAKE2B 2551147898282dc511a36400e392b3c4e19b4dd935ded68c61211afcad796cef7a22061768d6ce486e81e958fcb49f9a4c1f303fb847d0e9fc8c4066281d7fb6 SHA512 315fd73b64538eaa6c83bd32afe47a64eb16c3cac4c8710b79cbeb38b8e6de1d6e14b678e4d078b8a39735694a21add2695720f7bdcd96f7b5f41438b66bd6c4
+DIST firefox-91.4.0esr-hr.xpi 528149 BLAKE2B 307d94c1a9efc507f931e69c34ca89d13b0327176a8b022f497ec33d8e1698daee5f1cd3d61eb21892db2647654d155cef12b8fcd14b61394d3e80129217fdea SHA512 d25661ee98fe4dd552a98d5cf9d2a315551a6ef80e4a36418486967e0a85e7f09c26e3d01d4d692e57c12f10336898d854f57ed6d8b4576a7cd43da641b1817a
+DIST firefox-91.4.0esr-hsb.xpi 558158 BLAKE2B 429e76be5ec37826ef7a41b32fd966e4bd8bc62719732a9b2e0f52665dc3ccd91abe83857c687384610f28c5c887952a9c9662d7394071a49482600b21e01bf0 SHA512 d79e612ab8b21ead195298493b6e97cc38a648b66da8653032483c7cb4b481efb08bcd4aee6197a69c5d8692fcb1c85dff88a3e28b327e85855598ddb7d5207a
+DIST firefox-91.4.0esr-hu.xpi 561985 BLAKE2B d30551d2c287d19ffafcb034eeb3a1c645784307f545cd489a1bed92f445edfbd04794918e9a06c608c25b917f22f7c69be76b8b05f053ab83157895b76c5c3a SHA512 05fbbc80885d2fe40d4e2dc8b8b95ad3495a979c9b69a223cf38b67a3cb55dfae636bd63e051cbcea777085173797a075b8c37ca626984b7bf5165267e9c8485
+DIST firefox-91.4.0esr-hy-AM.xpi 576131 BLAKE2B adaa4291a56a0b7fb202e890d0f8a05b7dcf56d9b6ee38015895c145050d5d4022f5150770eca71403229423945f6692dea4c4ab43e9301403d6a5dcb54ef93f SHA512 1f233daad38800c7adce495053bc76ed5a101893b1d0187b73062bd45e96b3cebe83eb435c44da7b374ea0a76e00bfa78e3d816b050492497c1e254f25ab7708
+DIST firefox-91.4.0esr-ia.xpi 528328 BLAKE2B 71c39e655836fcb82004fe6a7d6308ab337d41b89312c57bc8c8081a05accf3a75cbf2dd443da4b3e99f35fe47e091219a27c94c8a971e3a5ce1fa9ad3ea6a50 SHA512 e345f378dd823b2e11a6efc4e9d9301d8eb5368e32d1a3b8e27ed9379c2c311214e67099f3ea6ef19c86eb40cf80f46eee0333e5e1d787f2c1c529a79797f323
+DIST firefox-91.4.0esr-id.xpi 517718 BLAKE2B 6ae152e686f9b55c067d9e3758f71e7690b8421352bcc562a375daa47ed1a7a811ab1f62f61c6a9ba9351952bb90bb208893787f4eae63943202d36545184f1e SHA512 a2974e9ecd45c4615164eaf55cebc7f01737f5dfdaf3547add722f33d215b013f4fe18546259dfb2943e08707ac196c74a5c5ecb6d2e931142b2874220b97e72
+DIST firefox-91.4.0esr-is.xpi 467919 BLAKE2B 3abc9ab10dd2eaee9bd335b715300bca43a03c63a7a2a292d45d2ac9f43b216848d498a02493e77ff5be9855f77290d23ae8c635aef29566702c55bde158a465 SHA512 293295d4dc560beb034fe565ecb828f80a1bac7486e297b315c0aa452ecf5ba759017e61f9a3edcebd8bdf2a6a02b5c7c8a3ea4db119d19cce76ca8df5eed197
+DIST firefox-91.4.0esr-it.xpi 455746 BLAKE2B dbaaed50f0d19596bd2eb7fe1584fa14296041e04eb987a845d21883ac14df80c33fe5fce6a5b66d8a062d5ce147242a31860d1d250038c0a6f56b738477f774 SHA512 6b517797d0df3d163fec14137184ae112c948c3146c271806546d9288e424797cbc8d664346d02e3eb702c1c920ee67d084015815da45457ff317bd4d4c060b9
+DIST firefox-91.4.0esr-ja.xpi 584266 BLAKE2B 8fd1614855bca5054cdab88daf77681fd9b8ec8487e62dafa6cf415322bb5992dcb57b4337c2afa7d9fcb863e4c26d608ec44af887f4faeb99c9322dd15cf8ed SHA512 d82eeb7df6274d12e53b48a6a5c5687dfaf963b9a41173eac1d7dbd1cb0d620f33f3551682f4e07343dc97ac9bb3d5993ee5c26978798522a8972b655426f908
+DIST firefox-91.4.0esr-ka.xpi 582191 BLAKE2B 50fbd0919e98d1fbec2f88506a412246590308c76ac541c9728236007e2c4a4e9d7e2c85eccb2c52fa376bd1453557f6a17ce688ed93e72994fb44cf21e0e1f8 SHA512 e867e77a3817c23104dde4f989cd0590d78cdf278d0b8ceffd5189e6b7bf37e86394fa246b444b86f1a8e79a627f02c316aa1a891c6caf33d791021004a3c890
+DIST firefox-91.4.0esr-kab.xpi 541441 BLAKE2B 4960041931a5e4ed22aae97f6a6ed72d2b181042a67ba85c9c96a44740ce2ed1644a14759c4704f6faa36e6395e600d1977447e98b38d6b6da415c974dc62260 SHA512 b114aa5f922a831e3fea8f2ad25ae54dbfb0840fb3979a55d72ce2b3ca59644e14075ef0da57c6b465603d51edf4ae81cdfd926f9ac0e428b09523d9e47a09ed
+DIST firefox-91.4.0esr-kk.xpi 602422 BLAKE2B b635982be599b6adbac1593e844f65e49987ea649abc6a41e0d5c112f1e2973c703025c834efc1f3161415e93e9e2dbcd3b76c03a845b380fc4641c14f004ac0 SHA512 81d163e25d069de9fd14440219f96ac5dde744458bea87bb906b2bdad21dcdf749b1639c6e3bae54e9cf50ff13f4425d07cd861c2890bb5c1b4cf902ec3c3aed
+DIST firefox-91.4.0esr-km.xpi 531026 BLAKE2B 694d6ffbf2e5155dbd5e6aad9cfc161309a9b4056b2e41bc4506700a69e1f5bc4ab458892bd6987ec9e67ab454c43fe9bbe4e3d2eb38dfc8681e2f4e29695f5d SHA512 d7e5e2b75885c03631154de1dba4bce1e605805751a2d34a2beaa50232e4af51a7c7069454be077ce65555903fabc5009195bb37978bb0fbc8d7ac976e5b52d1
+DIST firefox-91.4.0esr-kn.xpi 496518 BLAKE2B c0e0d5d8ef46e3cc3e013ee3eed5b5ccf71ad9b9331fe1c56ad451b9e5c70f04561ec29159f5d82e6007ac97d407535ff923be297500fcd5990e1d0d917d2360 SHA512 6185590550c9d78444c96f0f66fe6a7ef2ef46cc0220e485ddc8a9fedcaff2d779e2096dcced729c5d19732b7bb7408ea2550d87c66f5f94afddcedacb4eaaad
+DIST firefox-91.4.0esr-ko.xpi 574828 BLAKE2B 22ab4c2598fab7105f4fab62f7d37390a2c3ff5ff1334309ec7cc60406d1c4bbeab617c5511a0fbd0ea74ac7dceffab416aec2aeb6b2b307fd0c2a7b115a5952 SHA512 40ccea4f669d3d559837b0196fc1688d75e02aa39162e02913cb0d9c19a1d57d4705ba789d53c38f4cd2afcc888eb153e2ef79a0c618e04460b90f3ea95f329a
+DIST firefox-91.4.0esr-lij.xpi 468276 BLAKE2B b53d636db515a94135faa29e5951ef9f9628603bc6fb6d8e288c7e713294babcef48aabc70d53a1a2e5c5141551e2d5f3e941579f0cf40e553c3c8e8a98e8306 SHA512 c1e27148d9e18eaf972ab2e12ef6474afdce88f0eda7e81d20326bcc5f815b78fa60cf79c9bbb5483902141d8b46c048c94e06230ce5d13526f1aa56985f6885
+DIST firefox-91.4.0esr-lt.xpi 556483 BLAKE2B 76b7dec6dbbb222e8763b18563e33a74666aa1f566b31671eb44cc3908ec8cbccf73a496840be41ddbc7619c02bb8a2663af72417e4cef2f3cd48690606acfc5 SHA512 99dc34d152d48d544059f5e2c5e070dba68f6278de804a82b82919058a3308858fa00556f306fa67ec9e2dbf73b8bad7ad6eb29c415b34cca191271d7d3b4bd1
+DIST firefox-91.4.0esr-lv.xpi 460155 BLAKE2B 1f0de8813c7c05d4c8208adc0377637a1df9bdf0f5639c2bf2d5b440bc5c0772e60499acb1630e65f8912a253d7cd449b9afdad0b45a77d6b15c82ee3cb51bd0 SHA512 8f2506be64284e762b90f5c4771730f627110aac5377281ea17647d1bcf61e2911d0ec3d7664a7f6d3d7799e0a18f72422117d9cee36d8b18188da729bcffbcb
+DIST firefox-91.4.0esr-mk.xpi 463732 BLAKE2B 215c755574ce9204e1facb159b99b88730fa920b2029cdbe78a7e6815df30e4187e8b726f6893dca78a6bd71814524f742fc939f84198b81c6dd8590d3ab9ff5 SHA512 8fdc6e67a9ddf65281ca2e90942a3eff163eaddb694abf01672f1f2e5e7845d49543079e396ccc8a2403a2189143dda32f9053873c5e1927c3b09b7b7fc0cef9
+DIST firefox-91.4.0esr-mr.xpi 529969 BLAKE2B f9bd79323f907b67bb845f91138837d4ae30ff2f74366258a95f4104ea07c3840daec921a516fb929a59fda61df69a5f3ac0a18bb4bc73b26f9296f81286cd3a SHA512 0f489e4036ab4ccf7e07262f9253882505c0bba20f1e07f57e0fbedfc6e98c430e847e1d95285999fbde16be0d0757127447ed20c83fbecb0500df1f1b1c529b
+DIST firefox-91.4.0esr-ms.xpi 445085 BLAKE2B d8771fe6917e27c3052ea72b416dba33126bb7fb7bc6c29040df431385f04f2aa44ed80ec63f507ade28e6f64d6d02a63ced4349a6f2b7a899bab709a994fbb0 SHA512 8b0b4c4050cb7343b1bf13495c712352f244dd746f126fc4ffa620ce29cbf4bddfd3f02d822626e01c7a200f025073ccc918c7a759133bc772c2158edfe52bf3
+DIST firefox-91.4.0esr-my.xpi 514591 BLAKE2B 35db61858c48264ebadf7ee856861ef29c7da74f98816c72ca230eecd7051e960fb3206571b31fb1c4a13c2e02e1f4ee7922b0194f78e2751f99c57e1f08003f SHA512 5906da191e64af4273b077d49eb518d00ed96d13e54839e9b5f2a283f548b825d1c1331076644ca7791dc4cf3beec0e43b59331c741ef0a760281430a10d93a8
+DIST firefox-91.4.0esr-nb-NO.xpi 525627 BLAKE2B e96be9c59aaca41b37df77fc20be03fc011a20e121a35166dce6e2e69fd9f9245d373656e5122d876baab34e28a1360e9f7e1ef00c4b97ad409421bcc2fa595b SHA512 900267d676c41c0f83ba866139851a193f0267fbd531d0524f0e21b356763dc898f5777081870f6f3e4c69fc64653a93631c085bf4b6a420895b23e0032b0630
+DIST firefox-91.4.0esr-ne-NP.xpi 474185 BLAKE2B c3e041da59a92cf37e5b3a69debdce9392d2a95cfd513a3ded00c583ba424292ce54b8a7b7f9cb34b20d731803d0b5766e943132f868db1ef9fcb81a9e271a83 SHA512 3412c5be0a63dcc86831a9c85cd744528fc4d009c01295984e9b1fb9f8498abc17bab6dcd2a6dd5770d390bb6fcb9b934c2c367d71270f272fac222924bc01fc
+DIST firefox-91.4.0esr-nl.xpi 533414 BLAKE2B fe2537d5846d6d62fbab558cf4e5083c187237a364a6b80da8d17edebd1e973599d8cd6895d55991c20196cadfc45c06bfeae616a8542355b82bcadaef2ad4cd SHA512 6a156e7ee152273bfdd49d5af28d26b3733bbbd7c8b4d448d0413cd1dce0d086dbff1246c7464ca7925a502a71bcdb85b7346ff25888f3bd891fa76a59c94d30
+DIST firefox-91.4.0esr-nn-NO.xpi 527058 BLAKE2B 64e769dda2316320d75bc24b28827feb92cfe788dd349ff69c0f708f7f5578c565e85789a39fce97aa37a7e3f7647fa702209446cfa4bc3b391b606c2584bb57 SHA512 bf95f24d1d226fed9e75fc027166a6cfda3e691748fd06b132953d56c31e42ad8ed261264d5e225b7de32c138876873e40a8e67b564f507a50f80851d44f2784
+DIST firefox-91.4.0esr-oc.xpi 548919 BLAKE2B 0ace64b36a718a54d6b33d1d93107ee9485324c7b1b4137dc9fe84dcf70b85bf0f4ae75aedb67686972b493049bad11e7362bbd462d04f2a18ec78c942f0eb00 SHA512 27a72e76cb3b51589dc460b6995ee57fcfcf4f8e579a95edba87e0ab18ae857d289061933127968bde3aa29df3ed4f2772bc44105068019c0c74e453e7473e56
+DIST firefox-91.4.0esr-pa-IN.xpi 589463 BLAKE2B 7379cba877a4d5837fc597b9f18ef300b1093a66349dcc4c8d2d25b85074c8d45e1647ae22db909e3825f5dc3da0b606d6cb5d6723014943f6a292e61b3c2078 SHA512 da19812759622e3e76d02ea54c7431aea15293af2029817ef3005aa58421c7da1a144fe93905eb078653ccfce0436cc107039ccbed15d562ef5ce091d98f6d6a
+DIST firefox-91.4.0esr-pl.xpi 552660 BLAKE2B ce354c26bb6f8564f9fd776f1befa924c9e139d0d4b09684f1df0866717829551c260da38f3f819e39f2ad98dbd1e047b9458ae1f7f10f1f2df36df6942920e2 SHA512 8bc536bb7f45f6571cc625cae8178db182382846f49bb14d3c840f21c3fe778c396b1ad5ffa05bcaa53aca017cd8b9e3a1fc921024a88f67ddd497f76fc19bbf
+DIST firefox-91.4.0esr-pt-BR.xpi 538494 BLAKE2B 064f775abe3f0e7f692cf8ee7ec8de788f0099fd8a41d0f0c64d13fe309dd7596005a2b7af2f869a3e994879be2d94cd9fcd99ba25b3bf388a8ad08bd802c088 SHA512 c04526f15cad1e32371d3e1d95fe8975614cf3295f3a80299a7a0b921c2746ce4c4df0392d7e3e24926516aa5eaec0f48460601d3154ad2abe230b7b20502a84
+DIST firefox-91.4.0esr-pt-PT.xpi 542430 BLAKE2B 51460fd6d910c847d1e7ff7d918990dd41d0e875c1d76d36a6c7e56192058c76594f561eabc394e08ef635b9be4cc6344c758733de83baeb71410b663122c55c SHA512 cb5741451651dcd8720f79297c632b410ff22b9a4fcecc6c12359fd03e06ed414b87a07ddaafad5b49da4582068ad268b0bade8cd51ddd2bcdca3fca007cf3f9
+DIST firefox-91.4.0esr-rm.xpi 533244 BLAKE2B 0844973f8a88e55f1e60c41ebfd6e73051f0f1b7ecffa64343efcbe52cf1f9783379975b6a258b80e18352c384ccea76cdeecb9dd153bcbeedd3932a257d266e SHA512 1e6fd16b476a6440af3754411071ed0c5d3b483ea1b3dd1bab921175042f4ab7d894a308839e3d1cf67efa78884249f1589bab85892f46520196badc8c5dd928
+DIST firefox-91.4.0esr-ro.xpi 526985 BLAKE2B e8ce39ccb62069614e4a811061865cbac81a712ce5a8bcf1f56b9962367e69dbafa4f591ff695ae086ad95bf018c45158763835487b0ab388cb3424df3e5224f SHA512 a8f003cb9d935bf5528291e9b9175183036e069cd8f71b0d8aa13a2d387b9446c743b958f212141c956e4b52074c3d49b7839e6b1c7708c9d9d66bfa68504763
+DIST firefox-91.4.0esr-ru.xpi 622479 BLAKE2B 5c546e993726cfe05930d6663e55a9254e94808d91e8964bd6253b5a66b3f7fe0aa17fb95c6fe2211b40f1eb3205a142ab31ce0fca63a351402d1bd9e5be6e05 SHA512 c8dbcec0fdd628d5ee2aa7bd35df9d000ae4639d767125f9e60bb706718acc3f3c827c2da8bda592847ec180208c4f4a01499d92414b10e9a101cdfe5540d137
+DIST firefox-91.4.0esr-sco.xpi 503271 BLAKE2B 8085da172a519cf273a33e70dcd1f70f9423308186a09b2fc7775822e33a65ea3f0c751a8b04c812761259cff4fb604c5055dd34561581075c2bc71e7578c4db SHA512 bee9ec974bb56b86f243cafa3810462e1ded2ed1b356a80179323404a6ebc8076e71088b35eb1948f825d0dbd70fcb4617aad068eadd26537f5e2f2b5bd68976
+DIST firefox-91.4.0esr-si.xpi 485754 BLAKE2B 7898bc88ef5f480800efe25273b39345d5ecbf0f52fdd37db4f8c01b5f7aadf39def6ad1fcd8422fa2cc13542c73ac1ca4294ad01934895b857e5393df57b9b2 SHA512 3c0696368d4fe4963ff6ee4f4fa7ca15e4464eee567801e0ca10781095ca4d8a4128b0e393a1de6748492a001a941b3c9a072f07d3f4d020699f13dccbd36125
+DIST firefox-91.4.0esr-sk.xpi 562099 BLAKE2B c0c1e770acafcbb0c70a82235818b31d53f0b21447230fd88de12430585067ad418c59790f34ad45276b63e1f3cc6f07c3994d718bded1511f682445e83ec3b7 SHA512 dc3a49b3845ac78e6317a1651b072ea24c0c4e7aa68e2b61f0365d188e42cd6785cbdb1ae201b179d3a01fc3ef97f524b5fde1fd6649a3a86337a4db28a33c0d
+DIST firefox-91.4.0esr-sl.xpi 529903 BLAKE2B 69b9dbd60e92aebd07b31d5b52e7b7bd3973a05281dcc5801010ab0ca2221a661232d054ee4b544b1f0458b3b73cfa14e28871162fa639e83908a046b5317ba7 SHA512 f1d61aa23c06a165c93c15455f11e27a9fc77629fdf6615297f258999c4e7a1fd6ff6ea89efc6694252acb3215e6c752d2fb1d2b1ccc1e1a4dea9f1c61f064c3
+DIST firefox-91.4.0esr-son.xpi 424145 BLAKE2B 13973029336e622ae43522501fa715096db3bef7a2ab5b13e4ecc9bf45dda6083e5aef7b9daf078192f1ac2f846a29db58cfa7045915db01cd6f42721ce16614 SHA512 d397eab0f3e5ea3d9a7637f64bc1464f67adf76700a775524859d7e0833d1d4f7f9e1168e41a9e8283f8529c071128c5555ec4d270041dae1ce7113909d5b7d5
+DIST firefox-91.4.0esr-sq.xpi 544586 BLAKE2B 4ac371a525dd2df44cf6997a0e1c866980d4d861a8e80ea1d496e7f81016c814e654e4d6b4ac797c2d3e702bc0adff7a129c41ed3907133d0d2d952b8a61fef3 SHA512 23a606954e4d205aed77efef69eb509e5fe95326398932e0a8af36bde2fc3cf67b08b9a967be1f1b2d9901c7969aa0d1872f6f631df5642ff56c689fba743db7
+DIST firefox-91.4.0esr-sr.xpi 583086 BLAKE2B 46994159fc1ff22b78a6162c54e9dd93506fe604750a70c4a0fd395566403a46b95748c922696458a263307ed50472c4c9caeedb8959b65c002a18526795a0d3 SHA512 e8a9173c91738364e0ef4e9e8a42a5d9b75995ad10be60261407948404df0f31824c5dd93fb92e34b3f0a68ca7e41b51883b2e5eb45894d164ae8ea55d80dc20
+DIST firefox-91.4.0esr-sv-SE.xpi 536058 BLAKE2B 11ca31308f043605fa59a2856c8210715990c4e014925fc4fc07dc90c1400d622fcbdbc283bf622206e8ee6a4dd706e1aaa20e12d252f61bbc30dc6708e710ce SHA512 0be654894191d685a4ba9b4659d85b6ecdc1891687c10bfb89412f15ab8da4df07a1a9f64283efca4895b9c11413b9955283aa2bf3e088171e0e8f6ab5d5efb4
+DIST firefox-91.4.0esr-szl.xpi 508146 BLAKE2B 347121bdaaafcf3f91726c7ec6daa5b45d56470c39ecce3d27f00f5d7c4fe52478f1c7b8390480c58896addab012aa74ff0b41bbac57e82f3c18567be9444a6a SHA512 0564a38bc2c2eb65011d9e0a7d2ae923808739d5a29f8be54c2476ae11a607cec9fe9b2b3a28d35da9373dccfa803a19dd7084f0b85ba051e8bd7542ac52e7ce
+DIST firefox-91.4.0esr-ta.xpi 510667 BLAKE2B b4fc8de02fd9b4888158a4c10be33259bf60457f5ff210e595a1b93f723cce0d2abb260ea00d6138f0876cbb05cfa337b4eeb1aef6f008859fe968ed1c7cf0e3 SHA512 7492d64b776f6c187d186eb7479a2362da725be88c7ea6bf1d8b4914acd4f8130bbe9bc7b192770982645d2484ee0fcdb9b05356a5cdb416af208df583f6e590
+DIST firefox-91.4.0esr-te.xpi 547906 BLAKE2B 2002d8dceeb2b0a61577cb334402b68cff1c2f613542d87985d2739740fdb577a38501d37df6708bb158685f2eccb7fba75467b25394ae9fee6acd1afc64c1f9 SHA512 8b85b5d1beecac77167ad9abced138a2f0e8cc3b68b2188fb80dfe1852fc299705d32e150c1f8e250929c7af10d787fb2477d1e731683d954ac48a6e9995d075
+DIST firefox-91.4.0esr-th.xpi 597694 BLAKE2B e34e0be0d0b93015c4ee577f70f796ff9fdf02e3bab0f25f3e51489ef05b831d06ab3bb7f52aa29b72dd1a0824d0b4aa69d6cc69635810caa8f73b89c8897947 SHA512 e3665e291f71f2b4d11c974c255eeb9e7fb079b705e1f70451e45ce3aa206ecd0ec5b28207b57cf56a84cd5175bb8a8b0735fc23825fb1dbf93635574ea40f4c
+DIST firefox-91.4.0esr-tl.xpi 513310 BLAKE2B b549526e3d1db282210c81c68960dcfb95d67eb554a0931869b1390ff6ad81796b2e0768bde840827b2b56cd74b064096330c3aaaeb9245026fe503a2dc3c8d1 SHA512 336cbe0837696ac1f2153edc21481dc658afc35b0c61ea0c87b996036647fa220c447f3e7a8f0413e219336845cc9eb049dedf16840066533bb02f8dc41e1f54
+DIST firefox-91.4.0esr-tr.xpi 548362 BLAKE2B c878ba25cc461624cd86a6a8789cda55dd018e66113a50dc280fd62d2f9c5ca79eb3c7c471ebe511fa451cc72a28f38d3f6538895ad8b5df81db45e68d74a408 SHA512 70fd852fa95f8adadb8a1c7feb3d67700598b720cc49a01e133c16213a92f9afd8238816150f79b2f15f24168f7839dc7e00ea9afb7b2453e446e0f375995260
+DIST firefox-91.4.0esr-trs.xpi 488758 BLAKE2B 220d3383d3064b092c1eaaa19de4981f7edec0edbe1dacf06d866af846fc338120c64711f160a7a0ee04624528686b554c701e013042ebc907b439443754d8b6 SHA512 337d236b29d1cfc103052cd1c651e6140217c0afb9092be37feb81a964d8cebd6e26c8366457fe65ec4eb79379400f86c3635111f6ad17d11a86c304d395bca6
+DIST firefox-91.4.0esr-uk.xpi 615983 BLAKE2B f78f5dd87d49792374225e1ede6311f4c8ffe451b0427bd77f554487c255c94149e207183d79ad79c6eef5d96a3e4f8abfb6743d031bc7afb8ed93db5d9572ed SHA512 ad06e287b5c96bb990621b410d9c45db92bc3bfd9c5c204acfbea22c4f4aa09ee9e0b4366ce1c5bf174fc38c7ee664c5cfbeac3fe38ac874007499b3553931cc
+DIST firefox-91.4.0esr-ur.xpi 554113 BLAKE2B 5b7447e25f05d3211920051bc9e6fb807bf569dcb99f5a8ca383058a2fbcbe50aae5203f94f1242ae8e389a1ecf9a1602730a2445dfc5ca01afe96a551f7594e SHA512 00bb497a1729a74a67a83b0a7512822c4415bdc71bf940f9731785cc87869d98514b9c8fb12e8167ed0eef80aae4cea0b30f0410fed43924108ba49f8d0bf841
+DIST firefox-91.4.0esr-uz.xpi 465013 BLAKE2B 989f3dda30973403ca5c1eb8a129278105ef645889d4c6f32144c2970e54b13472860a815762f7b2c2bcc1646f227f0d63be5c284aa18a72b10a1d9366627234 SHA512 d38a60af12c379c3b4d0d24b478b3a964dc31afad481d3303a7cbf39555c29ef7fa33465203b632f88c586a4afac97da6d74a3ad1fe431d919133206c11ba439
+DIST firefox-91.4.0esr-vi.xpi 569116 BLAKE2B 983c10b007eaa88f324a16cafb90924e1a1d14c118616d1c526d4dbbf3ed6db339978d2de49f53afb53555f5bfaa63f4a02fc4469035a102332bc305c16ee533 SHA512 e33542cba623880b69ff11551380e893f6e6485c13855a9c4121bc88c1037c22510ab12efdc47737e3b389f6bbe278957c8fdc9ff8ad2f3c7e831db9de328ce8
+DIST firefox-91.4.0esr-xh.xpi 426318 BLAKE2B caa90a68a11059bab6d54800936f247c692b7eb8aae30178934d2486e635bb86b540601610062f32c6496399cb6f446741cacc559b7abd280eaa5392a894322f SHA512 08ef35e0bd42451280acf8b6d4c2c27b1c0b32fc070dd289d6405122f423e55b6eceb0b1235f865b5f95a0f257afb037f6cee48407014f7b435f712d7cd30867
+DIST firefox-91.4.0esr-zh-CN.xpi 571363 BLAKE2B 353648ce0c0b12a1e922e4169e4ed31e0dab3337a2e5fa53879e38aa454933cf4e76191da186053d888f755a1bca176e7e23d856f5b7aa9ca088e12a59791b0d SHA512 db04703780fe73b23025a984511f3e55189de663b563ed1c9dfb95de98e648842a623e5deac341fac9afd568b33f48ae574af8f5a49cbf808158551448deeaa8
+DIST firefox-91.4.0esr-zh-TW.xpi 572071 BLAKE2B df9f18fa4cbede2324aaff48c503b58cbe97f07394a2ddc00c7bb2a8e9e8f2ef0608374d726274bcd3890a97bcabbcbd25b56fe14db67c8cbe15948b612d5ba3 SHA512 e279a726a6014b6c473c275c8c3a786714757ca63d6311637f42787f2c5bc2778b36bf46302b932ee1a9cf478ac6a8e29382a389d84c29621d62642365b07360
+DIST firefox-91.4.0esr.source.tar.xz 379759164 BLAKE2B 073ad017a7a5569713bfea850d5572c6cc0e7c46dc3c89878a6405b024ee9a46453c8588b78d547f838b9d55a93a509a293f578a3ffac35b952e2bce84e931a7 SHA512 781bf62a0e1215cad7d90de7c822978997bfeaf71bde4e7124a732921d130762c6654417c708a299726039d1603ff5e0796106118ad4b2ddef4e9dac84887765
 DIST firefox-91esr-patches-01.tar.xz 20768 BLAKE2B 22ebd261b445f1920448d9243e3e15ed2e4d393099552bf43f26c9705dd00f8b87b5720e94fc43a31dd96c3a88398e17da80f81953f0bf9658d75e4a85a31fc9 SHA512 5935545535366abf8681286a9bd745f95f83ebf0d69ba5ce600ae513a4391fc16ea7eb4addbe8ad27f97eae3c1fcb05a78e2fc0fbd4cbf7798a83b778b5e1535
+DIST firefox-91esr-patches-02.tar.xz 16900 BLAKE2B 6b8ca8bca3c35c6ea80b947610906e36883522e265e655a18c16ae3d62512de8c2b68666639a65c45d4d2949047994bbd4fb5506b1062441ac4774b14291e0c5 SHA512 7382ed736b830a260cfb78a14c8c34409741949f9fdcc95d4cae2cb0f0b2909b6fff3a3acf32209528c07aed89cc275ee37c76e34fec1c89a920662ad42a3bfe
 DIST firefox-93-patches-02.tar.xz 32064 BLAKE2B a99ebed6fb2e3af8c3d1ef60182e56636f68c596fcddb0450853eaca7b65fa786ce3187dae9d1c5fbce0b9d8de0b2a60d441b38a26d6b1dcad8881c46c11d913 SHA512 7f51f30815dc2386afa1349f512d156d2da3cb2a50cd9c14e763cfdf00535c78bff82f25820977252c3e5c086fe31d59a753dce2d3758ebe4f30dcda7a41056b
 DIST firefox-93.0-ach.xpi 452270 BLAKE2B c7fd81469026d99e21553ec59d0d005e906915483b3765898beba694cf31c02aef3c15789a5c2e2e2d1ee242aef323ca7fa1c142912917ec2ca02a8cb9c604fa SHA512 9a4c7f880801eb1c4391a57107e88e3d43e6ce0a1bd617ba4d11951957e2d62116f102e55bb62db22378460c68d2ecb3a9b9b0285951c46846920ae02360749b
 DIST firefox-93.0-af.xpi 425657 BLAKE2B 8f0f1df2ddc330f386d831696dbbbd15f639b0d95ae4d85b268924116f93f1bce22adc10b6053873f0ed6d69f9067515774b7904f7595c89a25edffde2e25e97 SHA512 f8c122c624c139c0afea5920f063b981665771ae107d32b654206dc0d00a8173230a357ca72649bc636d02825f1af90d291b5e09f9b7044d05b4af1ce39f6e6f
@@ -501,9 +600,110 @@ DIST firefox-94.0.2-xh.xpi 421170 BLAKE2B 76ad46bddd3283e395aa06b740d65a8b8c2ab7
 DIST firefox-94.0.2-zh-CN.xpi 566220 BLAKE2B c011e86a071303e3f8957ff62a0ea9f6bfaa93b8b328f2e506af83bf0008e990e92cb275488b6767af5dbbec40986c7f7c8c63d1f50c25cd13710d900ef58e1a SHA512 5d67af7ebfb197a112e40985eb9fc49f98885137314c40eed8e7fc136b5d7e97b5a3afc81bc33a5a8eaf1d27cc9a31a32a1eade2d8672abd3765bcc86fce2c23
 DIST firefox-94.0.2-zh-TW.xpi 566884 BLAKE2B 315ff12d2acb993161bca86c3bb3fe69e0f9f90e37d67c0f3c79bcc463b4d1c7da10b70fde8067f85717d2d0435c23f46f5170625c63f06798fb7058f503f001 SHA512 ddfb47be87c55d1707c890004c066f57dd4adedb5b0ca8675854f9c18491d3f765cf1a5264253639c256ec1306329b7e63e15de07aa4559ecf9c680e297ba8cf
 DIST firefox-94.0.2.source.tar.xz 382896780 BLAKE2B fb10a7506399b410eb6147b2b0e93f1933b4420cf70b1c9e56210484de5930ddbcdc17e34abbb61734fae7a723a4032d250f872a684096c98f9c432a80b21273 SHA512 00ce4f6be711e1f309828e030163e61bbd9fe3364a8e852e644177c93832078877dea1a516719b106a52c0d8462193ed52c1d3cc7ae34ea021eb1dd0f5b685e2
+DIST firefox-95-patches-01.tar.xz 16928 BLAKE2B bd52c665fc035ecfdd4a3e4470f3ab9f853c26c16c55916ec545a0d8d4d00620ae63b7e7210cb84c03d6acbdf6725a024dac04c75172c33e10a9c40e30359bf8 SHA512 4572c4958a5d6494160300d4be1ed7d151f22dc0b82cd23a1c353cd8ade07f3fab75a577648c6af51f1762fc115f3089b67591ac9ca14c0582c46cbc913394bc
+DIST firefox-95.0-ach.xpi 450515 BLAKE2B 3fe20f62740464379328642cbacebc9166be39553e0f7158fd5d3c805874701917daa10f215e296b98ee8ad111e3ee66e069a65321bfe2da364ea57fd2c4d37e SHA512 551fb9f5c03d9a1e05e02b19fd36cbdf91e02a196f7bec80672efbcf30a109adc8331dbc49cb4e2a0d085c896f713af6c6469d8350f477f47a27b2aff922c7bf
+DIST firefox-95.0-af.xpi 421588 BLAKE2B 8e61208a72754a6f76458284baa5147c7a06df3ff7d4f876d9b888c7525f584907311e2997db5d11fe0c2d68309c065d27cea2e5e22d2f04566a89c36dd0fc4e SHA512 346ae3a1436e6f277a86a0238b166d002cfb9be361d6f59d06c595c4ff48db41c90d6adef4486682d7850522b48abd00e0380461af12727b2d5bc2fb8eb4f637
+DIST firefox-95.0-an.xpi 497839 BLAKE2B 6aeeefc0fe2bb28d851e1694ec0449a4408f1989268f2436f20dfd00386a7f5e21b07a941a27165b3b8c09c1cae8c7875a16a48dd0a44ae953d85569e06ab981 SHA512 acae1e417303fcb28c70fff9e8c3d86efcb41b3417d3624a49020bf1310ae5a9900054eda57e4413c8424c193a2b8ab86ebe0d45046c19933a39421a6d37c881
+DIST firefox-95.0-ar.xpi 556957 BLAKE2B 9388f44e38fab99427b5d81f0d4eb4918e4b81198d4b60e916b2004c1086362bcd0eae964d436c8fa1d787ecf3609f0499b0d1d754e453321999158cdcd22e2b SHA512 1b15787e4690dff02aa49494e018501c95ba3f5b0c68362a9735682c84ccb8a0b0fc94d919b0b0a15fd8333ead5b13028303c879e972d7d2d3af21c97b64e369
+DIST firefox-95.0-ast.xpi 495632 BLAKE2B d3684061045a422989e76853dc0d7de1d3deeb20b789aacc36f459620de7c9c472fb58c3cc06421c236e603345792efac61f9292ead66dc8999e1c4275ec1e13 SHA512 76bfcfc87f92e04aba40af0955425ab261227642e6d3e8cd97f2ab4cc04ec751ba5425ba3facb0d9ce4eda74041058d055bca068bc258f7167a37cc362ad7bd0
+DIST firefox-95.0-az.xpi 486489 BLAKE2B c41b7060af5c641499768d1553468cfbb068e3eab2e3549e29a190a4ea27025c91bda839cb1aa717aedc46a725f4e1d0df61dc1e04e73a43d339ef5c6301b03a SHA512 727af196fb12673d3a9f59fc34e82fa99a2ed49b92da1023dae2048f0dbe50498261d17243288ff84f3f64470109920d106b1a959476ca5413b5a1efdb768dc9
+DIST firefox-95.0-be.xpi 617804 BLAKE2B e14e9064c73c1247c77f74737ac8409342000e155768113bc9bcec2ce0362333b3131355bc66f81a97ab3d1df497b76d117191f2823f70bf46414d7dece53495 SHA512 ebb28844d8f70aeec72ab4262fc8bb53497f4293b97ae2e58c9a950644f4e145316064214e65af85e5f7f17de42bb1fb1de175677437ee7006e6b468a506272c
+DIST firefox-95.0-bg.xpi 564532 BLAKE2B 70a722b8772f10056efa951598d33e04e36f213b1c049d500cb8afc76883a3495805e1cb2ff6ae4bb5140032029bb018d85903085cd55551d947185c44020eb4 SHA512 186ec20af2bf495200d48e8f367a7cfd01a9da3ecc7019675b9f66bf071e660b9d79e98bec59ee02074168676fb303546723231c29b44e4f2bfd9892abeb8406
+DIST firefox-95.0-bn.xpi 553373 BLAKE2B e1a221ec3317ac111a4ce439df152e764886b5c9b9a1a9a71c44dcf32f243d9bd6d79356f9faab438f22cce2c7f04fa7933cc6732d82819720eb76451a0fa5e1 SHA512 e56695513a63c2884f11b555da6c4622dad2c8710927310ef2e1e78bb028fb57c1f7ff07580aad01dcc7dbdbfdd1fb876fc09b155a755b640cc94fa76f6d5e41
+DIST firefox-95.0-br.xpi 524087 BLAKE2B 2070ec3ade3c8c2765b6c130699a3e5297fb231f291b0379318bb54339bf5d18dba8e3a3627b8c50a80016e5e6b1a9eb4ddbd9f91c428d32b5c251c781643e97 SHA512 e6e2c9dacab74359eff56da967548c936f28bbfdbae3f246e45042e4ba1fc650c942b4b41ef08979a5ced64f2a99cee57c443a69d447918587423b496e537b74
+DIST firefox-95.0-bs.xpi 460948 BLAKE2B 1b9eedc34291de5876c3443d15a39bc8dd59e69bb07789c9c34b7df9cac39cbfe15a21182ec7c23c24a0068d0f6df944ad8b5378d156e24b5fdda55c90e7a6d4 SHA512 892218d00a0f3b08cb540dbc8bf248f93008c0edd190d292153a32c8a4542ad664839fdcb7f371391278eee289815f16949502ab4f1283ea3c7821663b707243
+DIST firefox-95.0-ca-valencia.xpi 526570 BLAKE2B fe44ca5bbbdff9a095507013da118c4db227c8b53441ead8097aa4ecc2c131a2b929897cad64be9172c732b7be64ba545d963758b4dde02e18e4682a2620e3a3 SHA512 87840b38a07db17f82adf31e37b9527819c27a62453304885772617548dfcb90ef0ce411ed2dc4d3189298e9bf4f8ede0ae7d85d6bdd2f74129d5001a4e21d5c
+DIST firefox-95.0-ca.xpi 529728 BLAKE2B 6dcf7a991153111792a79258cbbd8a6b916c2eab19b5eaeb358a5ecdbfb71bb8ab1e2a47e387e77b65c566eacddd5c6518df6b24c51ee128d9e1fb81c6801cc4 SHA512 9676d4af6f7484092d459b726a69e15b29563f5de26406ecbb0458b99a8fcf997607845f6349e26230c292fef0cdd739bda1bc06e674b9e382450afd603789cf
+DIST firefox-95.0-cak.xpi 550291 BLAKE2B 25d588295feb5b063696b92538ae59c477fe60d036e18d668841a1cdfa9a100b6203dc83f494f2c1f840944858ddb61e704f6f74a28a428f03afe611577e4e13 SHA512 23d01a09ce27cf835b1a08df86304139227f017ac2946be97f203a8074894445792e9c06ccf53ed95842cc9e80a86fc954b718f651609c666b979806908dfa54
+DIST firefox-95.0-cs.xpi 560520 BLAKE2B 9e4b836d02cc00fe2bca57326245a82bae2430475f7f9e9b98498fa61241c2bd75faa5f3babdd808e6f2b61d3ea36c42942f56563327003e3b7d0093192bb580 SHA512 46a7736f29465650b19fc7fdfa9ae7ba49ad6212530ff42fb21a04fcc1773bbcabd02da2ab06b87fddcfada57808244666932eb596c978add1ec8da8bec2cf1a
+DIST firefox-95.0-cy.xpi 538502 BLAKE2B 33953d710b38f333387a0382d39e657665c0a3fd79cf20fc70adbaff0460d71e3dba092f30845d1b98afd213dded01743ac10cd1d9bc4b2bab9e866de3d6ddf8 SHA512 87610b36a440aa73106ff3d198484ff644b82d3d23be56f51ef178ec88e9dd163bde390c87799020b10e803caeb3a5426e2eb51cc8ac27847e988b1ce8bc7f12
+DIST firefox-95.0-da.xpi 530402 BLAKE2B 1eb31b2569616314b1d7831ccc1a6f07f6b2c6a4102af056e41010a70f4d7914c2cde8f0da65589e6013b738ba2be38fa9ca0600e0eecaa441ddcf9e1bde019f SHA512 32814bb82715ded6204afb409a6ca0a790ee8931e6e10c4697468235dd843660e1899b17e24efe22fa6a5b3274a24df1769453ca0b40c48130e06b9d0a3375db
+DIST firefox-95.0-de.xpi 549565 BLAKE2B 30293bb4e923721df296defbb314921942597f9b4d5d4ef5fa19e388e729235730eadda3baafee31bf4cf21a4069193ed1a11277af8f3f32282b33bb40d70f2b SHA512 2e60f80e7bc3594bc14648cd8ca2d6db143bddfb58ffdd425007e278af014fff3c87eeccdd7dc3e2be12ae9e3b3176a10dffce453bb4ff7f85d91ee7d3ad93f4
+DIST firefox-95.0-dsb.xpi 562325 BLAKE2B 64529835e0eb45a75079ec18c45e9af952933cb9a98d5e0c901ea0ade4b77315584fa2cb17ac43b130f5aa6f495d55308be88655e096926368f86b968203ebcc SHA512 06bafe2c5775bd4e3ffaaaac0670ad0e26c96ab1c111bc6e5edfd839ef4cb203924aac1a295152f59a61765b2d63ac5564a35497de7ee1a105ada242d7ef42ba
+DIST firefox-95.0-el.xpi 634235 BLAKE2B ac8a59203731c49daa2340c714f896e3ac3b256ad3c46bae9954a4aa1b757dbf88afc31606fd0195b8b7093d0544b52520a5c7ac411033df0a10c8d9659ade7d SHA512 79926906f8f965424a1bc169869c835d386bbc5b09008bda013e1e0a0e9019b81fa265422d5a6f667e2a5cfaf6dc9aab6304a799bd852cd3f5fa16e5cb9c055b
+DIST firefox-95.0-en-CA.xpi 506099 BLAKE2B ea570c851e6f50b5446fea06df857eb3bcaba0ce1ef35a849089c5bd5b55f25bf503d107b68860e7ee368c4cd36e3fb12e0a44baea48f3c10b6a11507e018a02 SHA512 279bd4845fe0112c1408a1684c17788d0c10ecd933189009e0a5d7e78557415d9e6ce73136e9d2c08aeba60a3cffdd79799c869b12bf2bb60d29f6fa51981704
+DIST firefox-95.0-en-GB.xpi 507069 BLAKE2B e53f9632b22fc3357f6195960b619dd17d685d793c178b0cbb03beffca2982db758a97067f14a9d070bf1adb4716cb0e9baca570bc0f588b04948bdf981cf1de SHA512 ce05b73d2170b6323a1d3b1fbe1e2b29a898cbac8c304886e1f620a2ac3a473bfd20247e76261e674e1a36b392fd1f52ef409acf1fab3adb4ad1751552b79297
+DIST firefox-95.0-eo.xpi 531427 BLAKE2B 931e48677238a5b8a7f9b94cb9f5cc47b4b72512092b14bc196dde71172fd0049104a6233eb7bffc42bbf0bcc0cd01d502eebe7148b7c0225a9eb729aa20ba84 SHA512 8e47dbd945329c19d471cf896314066f4e6d3561eb4774027a5f0633b56b0c5f7bf3d4342086d58c61b75ce850b6b5147c5492699283a112330371b68e932533
+DIST firefox-95.0-es-AR.xpi 542817 BLAKE2B 577ba91822539f5ef062a6af801b212764b6d13d1ac537759ab8ebff50c56a083f626b7f818dd8a6499dc3d8abfd34987c5a2a80e09ed993e5c034bc5b17ae51 SHA512 20e6c6463df0738ba0c99abe8e0ba8f50207153dff69caa58addd5e705408f2d5e70173cdd7044cf098fddbd614686b980bc39f96c5ebe39396e820176a0c364
+DIST firefox-95.0-es-CL.xpi 542407 BLAKE2B 1d5f9f81599bb0c6af67e68d7ee3a09759a047aa9bdc9badda27973aa54eb6e34e2c060fa3503df9f6dab6fd86b684d8288d24bc6e9b456a323efdcd411b6001 SHA512 4c358e45f859d8c4c0f2a4852e6545cc2fd0d01bf2ca629db643202fd5958efbccc48c4b9ff28f37a5052257e45c28761028898c306b9a81e98d7a88dde85fc0
+DIST firefox-95.0-es-ES.xpi 533165 BLAKE2B f0a3361ff395c85efd8fff3fb68f9fe791c53d6542a992feba96590ee44078381e4769629765a1f626cb428fed34c7ef616a00919c224dae9d4feebb97a63f15 SHA512 68f6090a698cc290f2cbe45d5346d706902ae41ce839ce2e1e73db5b2705fb3f70ab1384b0529e2ab2bd20aa2aac425ac40284028bde4e9b535559427deb3b8b
+DIST firefox-95.0-es-MX.xpi 545980 BLAKE2B 6502c56441b0244677bcfba298a533f617954a51cefff2845e265666f9a8496e11ebc1e38cb0ef4499c729b4e9de1ae0bc3c8b73e2000557986ea720ed2acc82 SHA512 3283b0c15b22c31d3558c15c6448bc0fac3df2ed7d5085e31b86a682becee3f636b3f45665e1f55cb3ad569bd6b5c7ba47fc7010e5ca639a5c721b98689a5e1e
+DIST firefox-95.0-et.xpi 503978 BLAKE2B 58455a3a78bf9f5a85fa4deebaa624e38ddef24f4132ecec02d5c3048f7f549c06ba9684024f4d5c04e90a1dd9382f04a824e59f1c92feb57351216a0098450b SHA512 688637b0aa911a5cfd4054659449ecb24cfecd1ac7b2bb4e99d49c2c1077b473419cf4d44fcd532f6d8dad6b69fd18e8cf7ce69aa14fa90a0d60e99c76e60c8e
+DIST firefox-95.0-eu.xpi 532585 BLAKE2B e5cf65694bb88c9b043daaa43eca78cc18f4a555936259cd1049cf93c16048939c9636886b1368c26c9e1cf756105ee3a16e9c3ef8a12a4a708f87f3a8be15c4 SHA512 1198626f7686359794907dec80c1772a8b1755bc46e84d953e835c35ba41fb3f66ea4bc85b92ad07e364583e8d3b290c60afeb80128e8a9421a879f6a826bd63
+DIST firefox-95.0-fa.xpi 556251 BLAKE2B 6fda62ee7317ff5015dbe1aebc06ff0932a48f02829606529b0ca3227d82a4940f665a8b0ee5bfd7087481d90494ae0a7722da3c2013dd7dbecf90b653b6ac92 SHA512 aeb404627ce3169e3e24ab3ffc15682c3524b39f0132d1249e84abf305d6c488c709c2425c2409d3aec19c42d9ea3f48b9f74b8ca51eddbebd6ed701c39e5bba
+DIST firefox-95.0-ff.xpi 468414 BLAKE2B 32567ec18d5508228aa7f6ed47d366ed89d1bcd6d555ba09c1df813893472a07efc2b920aea7eb0cb91dff5c2957337da81089723ba7dddfac08aa5654b8f400 SHA512 b3ad7c506b9fb1a34bf1fd7d48982bbfbe6a5a0002fca3c7218ea55ca24b11aa5f75940d1f8f9490460b1266f5cd28901ef6d3be07f8c8cbbd65e3e6b3804b7e
+DIST firefox-95.0-fi.xpi 527602 BLAKE2B f98e194dbfc087e0afc11f0b8cd8083179dc046b9ea413c4bd4371b45c50da5bcc899ac247ca28fd999f94c60a98eed0accb3a0fdaf94ea319d1353c5bd56add SHA512 a6a48e1d5bae2d41ee73587e7e79b98415d61167c2c119079e5c6803c4619965445c5913139f420554ca537f2675d6eaf34669a9e1a58e61e5dc9907d8ab42b9
+DIST firefox-95.0-fr.xpi 553723 BLAKE2B 915a6cb4bcbd6eeeac431859fb2e568e92fa802e4ffa12262acb17c53d99ce63cd54c10a47eda458d10a90ca2c7c34978a67ae7998477c775ecaa5285b9f4ca9 SHA512 c3fe187f56ea1390c4dcd0f0776c7dc8f5d0463621af185401b3ef3912f78d6ae7ee1b227093b2c68cdd304bdae9bd944017f00a429ec59d3ee591d55d82d7c9
+DIST firefox-95.0-fy-NL.xpi 539299 BLAKE2B 3793ba6e07eb8bbd9dccfd6c8388019ab38798bae947e45033d5f557d1a4c49144108cccbd6dc8d7a995fff0179b05ed8e27ef34e091edfbfcf9cece618fefab SHA512 d42354fadace36cb3eb40f18f1fc44cf8ffbdde3d69dbfd215b0dec0b4eb3e809a0eda212575c649d5d052c23b7145dc8b37f09103122f928b6be77a58922105
+DIST firefox-95.0-ga-IE.xpi 456359 BLAKE2B ee362381323e1ab0d9452379bc6274807a3331cf35a5a9841e2f3fb436343fcc1c6a302190225dd7b7df9e061450cc40a0874fa4582b08029e293ee6e83eb574 SHA512 159ef08e8b271c18d237d50157c3626e6fda291f355fc015f16baa407e11ff664b7e9b52a4e26ba8e0cba68ee2a1fc2832ebf7d43506bae4457ea8064a8be3e2
+DIST firefox-95.0-gd.xpi 528510 BLAKE2B 2f03ddf60f3a0780ba921406115ccbc0d5985bfd552193d481c57ce7e7cf8c3625d2a33e89c2cd009fd3facd174fa20d9cc3d8b95b6f1fcb7f5105779529f956 SHA512 b4d447b813cff0b394a1f93a4f8c17cc2a1369872e506ae868b5131264e0c51f262da2c48eff76b6a3e591a4248efdcadbae53e6d5043bf077e1e5194c2a767b
+DIST firefox-95.0-gl.xpi 537648 BLAKE2B dad92ffd75438dbc8593d7e86057b3e179b4d5118b5f1e952a724ba5fda37a6acdd4034957ab00f16c645728d07d6bcf200fd1604e1a10ec0f57a96760261412 SHA512 65377280d2da2647585ee254b4f60a7eb06794f09060fa7eaaa0f4eb1df86409c338f6c8b000a5d9472b355701efa4df2edf3358b5ef146f928098f5a8f8e3ab
+DIST firefox-95.0-gn.xpi 553613 BLAKE2B 2096a50dfd019f2ece3218d7948bfdd63939f4da5d3634f161d21661657f4b1020ba27844a36d841577d8db2d8a49222ad05dfb0b5564597ce585ac23ecf633b SHA512 bdd7e22210fda6ba1aaac0bc2eb93f137bbc99fcb3c6ac18e822f25956b0eff1acdc407181d7e0e077c59cdedb912e8280d6ceb546553a5bebfff291a24d7fa2
+DIST firefox-95.0-gu-IN.xpi 525936 BLAKE2B 8ba13c0d070ea669601bff1389d5a0aa8cc6af6fdf0a7221e3171fe5615abba5bb1a26baf5f12aef1199548bd823ea40edc79e045cd45db0e1effbd310be49f2 SHA512 317d7f8028be22805708623047e2fe3d7e95ff82c6e02dbe9f3b5a57d12fb5bb91af0aa9af9f82ba64bca737a7fdcfc6022438b15fabcd1d5b1d860661ac0946
+DIST firefox-95.0-he.xpi 553664 BLAKE2B c66bf40ae133d60485b0965d4a20d84d7bc5c60ccc12809e374e4d641455c7b360fe1d4eba28f2107e590c76e22276540aa18b458b6ece18332182f6d9d37c06 SHA512 918900356296c9a62d6e9b9bdd38dce19b88571f23917879af49a8eea60bf5b836aee3b81a3e629d7b4471a75e2e7c97db67cddf9ceab90d7bfa6465fd2a6391
+DIST firefox-95.0-hi-IN.xpi 557072 BLAKE2B 467778dd8b16dbd9afd11347892c7c62f63991381cb3639e5857c7a4433c7572e4b815577aa89014a40514263e1cb82e3ff8f190c956b3f607da99e234eff20e SHA512 39b605fe5c6e91d1c5e0768acccc05fb22fbe340fd235822fbe25be04dbdc0d6bb0e3915ef7983d3b079baed88a527de3ea307f9fc1de5a0b7ed6d7f68110b5f
+DIST firefox-95.0-hr.xpi 527718 BLAKE2B ac46ac1454118daecba9bcca0ea7ca939b5fb01eccafbdf99ac4800a266ac501c15a31975ab914ce37faae66cbf1ab591608f215673042c14fc786cf2c084f6a SHA512 77389343ae828186e7dc4ec4e34738ee2e09920ad5e3090fdb94f57639d3b35d21e587102fbb74c5dc05805c7b69785292d298cf102c3e7b581c229387777cf6
+DIST firefox-95.0-hsb.xpi 558439 BLAKE2B 7e7606d884e77ddbe006d3f5909a797f3649845196323d5ddc3832c97b388c7eb5995e2a8aa42b94ea6bbde96d9dbd3c940db3cd3ccccc9899bd2f93385f62a4 SHA512 dc99c334cd3808c96be797c732507884592881defeee75012254a934616c564f1a77f306fd3bbc5852c71a5f2e6244212353e7c3d62cd0bdbbd7ee4102e87fd7
+DIST firefox-95.0-hu.xpi 561838 BLAKE2B 27d99323b98cd46f1a2de46edd451f19acdc780564f99d63c0a4b2f345cec9959123d5a68fd06f3034abfe511116c2c302cc8daa0493ac1eee2a1639a072605c SHA512 149c14be3a22be6b18fb352336f11af2213ea5f3ca84c8dff2a9bf902c03364ca013a510de9841ca16486e2de2b007209ab34a9163ff1a5ee203d694015aa752
+DIST firefox-95.0-hy-AM.xpi 576865 BLAKE2B 02afc0c5b116e384eb73eaba9b51d53edc38584d32063d97c7ee7745c15801d4c2fc0227468d667a9bd114ad46c9d215ba57010732e81022eae1a9b0d8ea32a2 SHA512 8518abc97346f90b75978cb3a48522f3b072a79f5d589ff5566b9836f3918bf834390f7ae30a881533167dc139f26ac3723e128968b93bbae4f34ef93e2684fa
+DIST firefox-95.0-ia.xpi 528438 BLAKE2B 39b4ce0a650a4f4587bfdbde2fa7095c2bc81db72d4a785b8597cd5dbdc9826575fe613c9d5c1372f8ca6a1ba732364fb10f6998741db4bceed44ba39efb04be SHA512 492b7617951d24acd00b1ab28453f35f2cf88722dd97105fc09d1287566cd27a1822eb4d3bfb953e5d1285cdc7bd7cde9c74e58deb0206db3e9c107308de66a2
+DIST firefox-95.0-id.xpi 518116 BLAKE2B 80f9f3fb82c47a3cd23660dc6745da3ccdce80fe996c6c530bdbd9190379692ca571949c5ddcf886e89aa232c25a49d1b6c44d167dc3f8b1ea23932a1b19b41c SHA512 83f72af2c7457f0555cd9a06212e44846867698c813daf72c190bd8bd311cee4565c254e981a848cb5359fc945f0e730bd5168cf8fc763a430521e47102ef538
+DIST firefox-95.0-is.xpi 467522 BLAKE2B 7294b6dabbe6054a8e81abb9e07baa0de9812d413ad6765374332e5f110db262fdd9386109d2fa237fba387de7529dc4466fcba39f38fcafdda693fa9c3ccbf6 SHA512 d6301e73b43e01584dea2250a45fa10a2b131fdaaa82988a43a070763c347647e7d4649afc54390c517c879a652a77394910057ae569aad62a9133859a5b060c
+DIST firefox-95.0-it.xpi 456459 BLAKE2B 50426f0831287966e74f20e6af143fc6d43740ba3d5c3d69d7a11ca9773fd87a5ae2b7056ca17c1570666cb8b5cf415c1fdbbf0a042ff35cfdfc2bca6c032c79 SHA512 5c81581b251f8772f39dd9084798e4ee260fc2145224a16afbb4f2568a7482ee3cdc46779db3436e1345ba39bc4fe63aa6705994f2f0cdb0dd633b88594722b3
+DIST firefox-95.0-ja.xpi 583404 BLAKE2B 045f27584721c8c0d0a04d28f6956588ed013bdcfcd6f8505d5e69168df86189f8120c5f0f55c56c5803dc58258b7cd524bd3a81c1943612221af7f417394444 SHA512 7daca5ec67a72d3ea71cf234feba68f1d8abfd849b252d0fdee4e8782884f78ba6d4fb31fd0039ae05720be1e56e92b6012447afe991cdebb113078340d78d18
+DIST firefox-95.0-ka.xpi 587672 BLAKE2B 34de6399c51aabe30c28919cf5aa5306fc75d18a2131ee9fff94f19b264a9c2316e145ddd347a2f9e7fc204a249f338a7c08254747ac3c41fbf6e76636ad33c3 SHA512 3a43d89333a34a346a94e65faafd296e18266d6a3617ad8b7e1f4599886d1f053855e0995f19ccf8965afc88c22898cd8a7da02017b6059904a23a9ae2773c4b
+DIST firefox-95.0-kab.xpi 543119 BLAKE2B 47130c805f67c2436a5269ea4b5d35d11ca3780f2ee1a3fb7a34b16849dd838e24e8418f94df8ce33f8754cd37347a141fc445d908e0d11001a056ae52da5ca1 SHA512 8f9bcfc33aeda142674fcc6bdcbda9ddc5d8f6978f75ba2abd0f5501c25f79c67044ace25ce4eb2bf438d72f5f243af1994e1cc33fd4eef2843f9be204cb9c5a
+DIST firefox-95.0-kk.xpi 601962 BLAKE2B c842658d861010559c64b3944d389adbac21036f0781f96677b6a0ee4511e5d1bfef91a94adb22df65d978e9072c504d05e4708c5b1f740372eb694433432a62 SHA512 cd73493d0a15186192e5ff433f6a007fdb49529791bff044facbe9e5344116c496de5f0da74be661614a068964a967784eb786e4d59f49dd6e0490efffe36557
+DIST firefox-95.0-km.xpi 528933 BLAKE2B 1e459b9b8826a509b3cb9f1e400c6f07c95e2351987562097b580263571ad6db2c02a599f80ca8b96c2608900e962626d37b070aff516b0cdf7f59a6d5b959d6 SHA512 efdfaa7b197015cdce00c6837eedc776ed53120ef8fc95547aee6118a7bd4a2131fe8e0383fe0940f653241c50a307f5abaefba7b11335ad62dae0c0aed6f780
+DIST firefox-95.0-kn.xpi 494304 BLAKE2B 45cf6be539ecda4fa17d3f88c726384266f8a9866abe8356df193a5296018907284a49c9d3bc4bf4d9ac7f07238e592bf49a73180431b5930c816f8e743a5c1d SHA512 e62728ac977a598486e181b936a0bad4c61f6a842e06fa07e615015ded640035e92dedd8dd4e8ad0f141b60e4b61263747d6d657b987e11f7eee6948007b1b92
+DIST firefox-95.0-ko.xpi 574782 BLAKE2B d11ee747bdc13e7b0f9202397068cb58100849480921b7a93bb791025856fa6e7e714d716c05327f8ccca2c104f273c4c229e7a7a3242bb7482b515938f07e86 SHA512 58621fa4487d76dda0335ddf76eaa98c2fc61b5c37f3445d83472acd0623bc1370efca5a13d26ad18ea1aba5f437aa623977804ee5bb1d41c76957411fa64d4a
+DIST firefox-95.0-lij.xpi 467379 BLAKE2B e038e7d3cbdd75d4410e7938db17dbe18980ff66441dd014a9904fa683f2e2672ac57774ef462e55630197801e99c43965d2f9025bfdc16cbcecbb701e73ee7d SHA512 0ad2699fa1d96833b8d20428a420a95cb1ba096d195562dd351be74eb6ef1bb37e8b3b1838e38a6f6e4b19e3a1f0af427e1fbc31d8e83974243fc6e40e692845
+DIST firefox-95.0-lt.xpi 556126 BLAKE2B d57e3a4da3173169337963d84c18fc01a212124422e2deb3aff177a36d3968beb1407c51268c30db5d4b2056303d10f9097fdfc291f741c0c9ab5fad715b78d9 SHA512 513abc915c526048f4cbcdd9e33f7c10636ecb52a38660f994c5f1d5bc4f8b759304711fdcbb26325f7853f83e75be147bfbb27608b96b3437e6761132f488a3
+DIST firefox-95.0-lv.xpi 459576 BLAKE2B 2c46cb32b99d4fd6f9903c0933b70c6bcedce52b78f3f2f5414e04cef209f06af135aea03d63fa005ace1ee85cb5ed9343fe36cac05a5f70952ad94a36cb16cd SHA512 c1101737b19b663d08c64544a50c5f75b2e134f287fc1cf53df29401847c61cbd2951c321a1d3e81b724dc594575a1351bf3c1571cdf86aa894cf58a5cd1b16e
+DIST firefox-95.0-mk.xpi 460717 BLAKE2B 591b55228c7e572552a21f07d4eaac87548055442aa41ca2fe63e658c64e4db70e314ec4c259b43ccf0302c81f44c058b9d065d8d21950ed716b18679b56d21a SHA512 7e1151e19ee75b81cac6c36f00278981c0f4dd12322b5c8d465811d0931b89d9d6bf012fb43b4943e4b67db0015fa3fa5ac84e792c3a4934efba3c2bf389fbc7
+DIST firefox-95.0-mr.xpi 528738 BLAKE2B e4bac04d0f10d638e2bc02228e2127c56a7196433cdb2116528ca50c423f7064be9adf4c8fd8537c4deded872c7caf187a812b14b37720ba7b0e4a29e1e0c919 SHA512 4ab9e64a1fba744a55b5ac7ec3a614bb6271af4693d806ef2f57724c561423e3f8e6ff0ba162e2c5deacc3d65a58d806dffdeeb8a29aca6f391309c3a5233771
+DIST firefox-95.0-ms.xpi 444663 BLAKE2B 545a6479eb3cda354449669050832c539b75692d35d2e373bc02fffe2bfd19f95c8241ffe1fa1f56c37e0de359c1ff035408c9ce5d81c40e27260f34e34dd783 SHA512 6273fe3f2b686aa80b88d5dc64e07617eb28b1e0a2de962c4eb77ab730cce0ae49af97f33520bbfeaece34afd7163f7d7b6891159360af66829f27aa3aa37981
+DIST firefox-95.0-my.xpi 512526 BLAKE2B 8766581eb05049ee7a430a67c9ae7b962085c4588f35046ac2a10e50df5bbff6947f681e1fdef756f8210908f97cccdd41496fe3b96f0959b3f19cf0bd967d81 SHA512 fdffe4140d38237789c7cdd43e39aaa0e1e411a62d398f792a19724874ee5ccb56de0401b804ce07fc15e9b502d0ad6d3e8b77f1f63ca6daab9cc2399586b94d
+DIST firefox-95.0-nb-NO.xpi 525747 BLAKE2B f48881217157c037451c9d685258ede8ba0f10ae890a6a01700deccfdf2e7d3a410bca9f8002cf313127098a040638719cc2c1dfef73f32d1d3e31311c1621cb SHA512 a199a137a39d56563e5284548fd9012abcc57234570d3eca5fbd648bbccf352cfbbb6671d6c0b16b23b655a26cbbb366318e9b370f6a9b5348630183ee7f1b04
+DIST firefox-95.0-ne-NP.xpi 481248 BLAKE2B 003af761306299f0a3b9633d675298427fc97df0cfad50334621b52eaa4e25de12669478481693f999fa7ba8fe17950bcd644cb8b1d67dc825b44f27ca44fefa SHA512 8ab172cce511c74edc101880825d447c7f86ec2e8b076c0206e91c6a3d6ec7ec8438cacd5da94dd572df61f6da51b9619b053727157319b1afcf85547d4017be
+DIST firefox-95.0-nl.xpi 533457 BLAKE2B 47079b02637c9a3eeb6a22abb09bb48e0d606d23d4aa9b62b05f03049463704665d6d885380bb4560ab55d16d06b6b163869b2843e8ff127827e4cebd73ec03a SHA512 2e52326799609e7c1a17f43829b2ffcaff0888b88ed1182c173e32433abb471da7c2bbba1fc237ca2eea73138d954fd38f0614cf055885e175612dc53bcb492f
+DIST firefox-95.0-nn-NO.xpi 527937 BLAKE2B 172afccfd416591b06f0236e79a99d5c54d96535b37305ceefdb6d4b08f632b6f4abd49a00e4c69ca602ad17bb71edd8f49ff3924680c01fef6c6b31fd59582d SHA512 b97f19e24126047cb51797c2882b2bfb728595206924f9c53ae37bd3ff0cd30e27a88669e4d24f4bd788523358ea650cc792e65a26d6bf8913f5364379fe4332
+DIST firefox-95.0-oc.xpi 549080 BLAKE2B ca7a523ff465b8750458ecff217db8b33866816a704565f4c7646e885d6c1861966b1e6f0d75013da454b1e249f5ced8b8dcecaa36d3c5a579c8c26f444d8a11 SHA512 5d7f2a4440b9697c5b2d9fd2f3c079085420cb2bf1f76e9bac80b8d17f1adfad8b8ab99152c5287efceb22ac26ccccc96ae8f000baf9af7f2f56574f95b8854e
+DIST firefox-95.0-pa-IN.xpi 592184 BLAKE2B 5a03318fd405de07a7874ed2fef380ae103b98590177c9da0f84a92da6599fd48d09bf0e10c60564ab287cb36e386bfe5637d809d02f2aa60fe426f68643d392 SHA512 f04772e873dd0bcab39e3641fd14928b230b315f0bb01471fa403a866e4eb222da024fbdb69e85f8655e7ce6c6f41a88a5616d4935527391a95b6665f76000b6
+DIST firefox-95.0-pl.xpi 551775 BLAKE2B b0fda1de615693a07f81e327f2343eb9e0836d6c80978e6b702ee6edcd48530bcbf7c1538aae146973d3438b3cc89ffd6a4daeb27fc9c3af9b3048d2509871b9 SHA512 b7c144af35ac65315c9d709e047f5dfb64650eec9ec3ac967e031506f93ef9312ff4c590d474b1aa1e3f0c49e7b18e31c857477f316b5960354d5b5179388c91
+DIST firefox-95.0-pt-BR.xpi 538817 BLAKE2B c69a5aac089154418ad3be52dd819c582c5ef04ab277299a843948ed20d5a1df52b7ef275a43888c2c2b11e8ee16112db27c960ed1bd0c500697287d23338491 SHA512 881335de74fd0cf83bda0ee7538f68d7f63bf28a7fabcff6ae84ec7d68e0fb428ccb3c7959866776eba6889816e72be3dd00f7516e4bf8447452b96cd4bf58c4
+DIST firefox-95.0-pt-PT.xpi 542297 BLAKE2B d215211af7b2c0e6aa7d4f40b22f8889d8b242790f38bc913ce5268219280c2b4ab5dddaf55ebb1f90d087c8c6c115292e02486a6a100c0eeeb2ab170c1fe530 SHA512 e861aa28696d03231b68ef7820f3b2beb71d8a441e62d6fcb35dffcd05b25f0f20d56206a3de71717029d9f8654a31dd75bb286606dde20ca91a52524a0141bd
+DIST firefox-95.0-rm.xpi 533362 BLAKE2B 9e9fe73ab0f8d072dfc88b5a5bab11ff27a3683ec9e867ea0a3d478a656b9aebb229f9b3a3f101183cb9481be80297e0e527a71e46b33a495639822064baab99 SHA512 e99367f50ff1bfc5a24d114990b619097922375e86ce706fc1390dfa19ebd9c70617d3b61fdf8fc1441a5aee759b2b4b0d1ed976fd9f1bc8971c39d7acc6cced
+DIST firefox-95.0-ro.xpi 526935 BLAKE2B 289d63649ba197ccaea3002fa0b165dda0cda9858dafe90a4aac838033dfc400b5f0fe17830626e48aab9a0e4184620ef2ab8297d827375b1579ef59548c0534 SHA512 d87bb24c58f5624cf33cd00c4e35a247a2093159243aa3ae2a77e74bd1b2d773a36894d705665ad5ba14ea014cfda5f068a775a76b9b631909533b5ecdf5dcb6
+DIST firefox-95.0-ru.xpi 622429 BLAKE2B 88c622874abb3c2a102edaa1ebf1ea080dde5baae4a2148d79baebcdc9b494aeb4f768264c6f0a1f53b695657921b59a039e2ec8cae47955cdee9be9b93e515f SHA512 048bbba2b8506838f6aff171fb1474e2e41c60519fce8096a43740b11081a17230963c558704ecf4476292b2d7cc770ce659ee6a23cd9c78f8302b37093c88b7
+DIST firefox-95.0-sco.xpi 502276 BLAKE2B 74ccf3d089973529bdbb5a140c4bf1ac91e9cd6435eb837aa7df477ba281df89b107647eb3a41f0980ab49676fcc06a0d4462172b4715e7c28a88fdc716cd5c9 SHA512 86cda28ea4596f07530a8f6d6a2bb3da8ce36f47f5b222eb65cf09a1436fa2de2ad58466b589f734925d5d79d0fb14e23ef2583985e8625d78ae9c3ee05d60ab
+DIST firefox-95.0-si.xpi 484211 BLAKE2B 6aabb660f7bc8e57edfd22dddb92f82594ea8f307679ea32f8d376bb2ce1c0d24cbb81b53bc0c4f492775cbafbd98abec364e5b634f7cdd990079a97298a1953 SHA512 5a40505ed8bfc9bbeeefef8cca36f911a7e830a8e386100fcbb72db5c79f9f898f899002d8059f1480df279a26565429304540b33750db3253614a205550c995
+DIST firefox-95.0-sk.xpi 562407 BLAKE2B 3a01a8bf40cd0bae4d7b24e41b551cb21c8f850daece989727a88a04711f7f1a1b9091efcc7cf9a4bdc059c00e60d61270617c08a2d59859c73a5b8a807228c1 SHA512 ec4f21d61906c70c96ba530d463ba0a2d6d2e893ac68c818152bb695c28d85a5b70a603279ac3b37107bfae85000d664956eadbab472f52297a90986ac00031f
+DIST firefox-95.0-sl.xpi 534345 BLAKE2B 58eda7c2f9405cf644843ef9f5a2b7ebd23a051a78dc28779e77b99b8c9c52605508c26133e294ca109f7d87fc470498955e7c8d41b4bbbd81ece0b6fdabad8a SHA512 e4623d8373a853d45b7b0fb3b81129099f38532ac8a6048a7202990e59432f769b035ace16be4b228db2a31eca095acb1205627e41a40652feb33456a55be0a0
+DIST firefox-95.0-son.xpi 420603 BLAKE2B d08a1a531523dca9cd8268c7205edb08f2f16a9fdcfe708ef03319d61274c52384ad7b2c9c39fddf85026f021d6f411c9c5e80b21535965a6832beb93f56ba1d SHA512 03f2a58a408bb33c05c8da67508c3244a528dfd4c1763ac8d6f9251e029c79f98075b191ab7937c3bc3f329c7a089d10c64e4361f9028a6d6eab7e47d69da0ba
+DIST firefox-95.0-sq.xpi 552427 BLAKE2B 7a6cb3fa1d5c2ce397c54adcfbb85b83aa9001bf355d838bbb54a1eeee681a1dcbde7d9fd8266bdfb080188cc1091d935fef39ed39d6fc36392405b0ecd5a993 SHA512 0e67147bd01929ef9c0bc00893166332cc2043bb9a1e53bc4437625102cc376b4bd9da91373b480198e3f8c8c9eb05a8aa6774657a18946590d240a148de788c
+DIST firefox-95.0-sr.xpi 582868 BLAKE2B db8768ceae1a9c3a705212ccb77537296e24aaa14199e755a1d32da318d14bd2ef1bc960bd491eb3b88904ac3a4c5d37f3cb683614db3076d30202379da9d724 SHA512 68343edaaaf9ce66267d32545b077affa9eeab5a220bed1f3b08da3db239be8420709006eba56bc1e4e4bf326c08c7ee8f521b6cc6cb4147d11c54a9ec904042
+DIST firefox-95.0-sv-SE.xpi 536153 BLAKE2B 7f1a33176fe5e4e41c4797e5d801278989d58a2e77db8f553adca85e32c86169020540f9d974c17f3d7a977fca2972ee9244f7d2caa997be9b73dca1036f36f0 SHA512 f631df62d197c75ccc645b86e5131c1a3171e755e9009b3b8826fd3e7af90f8d43b974e7079ba6beb5e92c0243773237c16aac17bb559cdf3c4e34929fa68603
+DIST firefox-95.0-szl.xpi 507025 BLAKE2B 3998bafc5c46ea7158523e6ee4722d5e1d97b96b0e8f06eb0129283d7070c7238833037aa13e9148a11f9bdd50e0ef37fc9d1cb7ee907cc60cdc1b7dab70cb1a SHA512 664e90e66615d2cea2528d7f3d90d883ad76219ba12147ce0931382e70f85d2f590b31c9bab9f035e1ba279f750e8f165909fa6400fc0d76a713ffa60166ab9f
+DIST firefox-95.0-ta.xpi 509400 BLAKE2B 04961b9383bea30627e053b512476179f3fe04a3605b8b5813bb09617082deb48a7a971052fc7edd79f162bbbbaf6201c85400f96ceb0d27e806a5dfa7add122 SHA512 8da011875792d71cf80107e96f91dcc1a5f4e7725a2e71e1654fea905345b8023566b2eaa896e160e002790164b13bab989c75b7e2407f590e05fbab74a72df5
+DIST firefox-95.0-te.xpi 546760 BLAKE2B 7bb8a94a2311fdcd126f6d8c7d76c016d42c88ed063f5a16e8dcc633f6a653aed1b3ea2cc850dba4c29abe488433fd1611fb5c20609101c30c1233b2fa3a6b95 SHA512 b955574375fa45a20b55898eebbb1eacf3dee43c55cc3862343b3e21ac9acda9544d9ed116b515e3f0ee8a57c45b553b97f7c68d02ae59794e90df503800130e
+DIST firefox-95.0-th.xpi 602687 BLAKE2B f2af676483ee8918a76c5bb90b1f4f753d9912879f72b0f3cf370242f2d9258c03dd76fa136d039d802336a67ea59e004658527955d708bcfe8a1c3678a6edc3 SHA512 b7987b4e2e6ac604c6c69539e543ba2050342e087363aa1650837adcefb97455bb5cc92fefa0553d7152e8b2e03b6c0c22499ddea1c6fcc9e8e7d58f74ebd33e
+DIST firefox-95.0-tl.xpi 514073 BLAKE2B 04fde0285700502bf278fb6af49d01f95839f34348855867fae9d8ce50bb1e75b2f371b9770f7d9f0d191012cdcd9fbdb2d87df887d450cf7025136c34266281 SHA512 752c4d3faa0bbd1d189acbd265bee5700825c4c006d5bf5343e3aa96747a4eb50aa3cc714eb0e96206e0a81619189a3a0c877c03d8a7598533711e706fe8066c
+DIST firefox-95.0-tr.xpi 549761 BLAKE2B 5bbc39f2a80c896ef7bc16871c4034f3c7ad7ec5ead98b8a5c22b573a34c46e7059879687a39b2223c0058ccb19f3243f1eff1b7484f316fafc905859f3d4b2f SHA512 5a3192201ec54196f1af306339987631d6bb55b5392f8b3641facbac544d1906bff9d5312bc0b005c259dd2cccccce453a2a910e4a93afd321266e08b929d0d8
+DIST firefox-95.0-trs.xpi 487959 BLAKE2B d86920e62b0dd0338964d5bdecedc55f4d43781cdaa57080d7b2314837d52872a101dae4b02a7fcba447e4aa48eec243e986b55b38a37e1c228a7cfb8817ad91 SHA512 de92ac2cfc8c9f2ae90506ea22720b3914a3bb63822b1f6daaf544130eea9055e3d6d498b02ae25c3fddc1e06512c95d5aad0206419582bc8d976c5e058b3d5c
+DIST firefox-95.0-uk.xpi 615803 BLAKE2B df477a4f9badab9e8c9c90a634e7a3937da53584ce1dd4d6c08f6934de93ef4b62d806cbaf9ef50c22c528269dd3b352607c1826c96ce93708c002cadaf38ef4 SHA512 1650c9cc066303ce1c40277f47c06d05e372e0df9dd6c6944549fa3741339ec3c4c4e6ba5b64162997605878d897e518d6d201c2611fa1a9e7152eaf77ff116d
+DIST firefox-95.0-ur.xpi 554230 BLAKE2B 9ebf28b6630c7ac86c1d86617f118dc55160d8b979aed4d5041340b025e3b2d2db8ebb3a15af579f3410d8ebf7ec4b18fb6a3e98758d14eca7f1016736f10279 SHA512 32299a4dbc0a7109f6e520a4cc0d3b69e97737fadc6ca8313fd23b9524971f1f78b5c214a4eb05b2a3705277e4b14a538cc1394b65e00bb5479f9b233cd966c9
+DIST firefox-95.0-uz.xpi 463752 BLAKE2B 8ddfa67828ca4865a6be32024492d23ccd5212bbffc1cb0533d99849eb1fca7356e355cb3b980dd0767232c3d78a71bbd7d90fde5e5318d7be05c118a3023781 SHA512 d5cc2d8ca356a30af0362659352d76e4b4bc666a03533f371a3637f158cfb28c6aafef76f9fa0b238d5875d00219e5029abe13fad56fd189876ea04f2c204868
+DIST firefox-95.0-vi.xpi 569408 BLAKE2B ea2d973c250c3a46621567bde9d6e9805dc2231569c8431ae28a3eef4ee1705ed1e48a4cbb1e1d47b31b5899fd4767b1e7e11c989c17a006dcf8629d95870e9f SHA512 304fd402b2be4174a954545c247269f66f716722eae6c3e299dcc8299f0da9b1daa2f637fd3bf2dc0c04218f493a91952f0f3f67d010acca28e969ffbc4cd102
+DIST firefox-95.0-xh.xpi 424123 BLAKE2B 35ebded6af47343021066ff726501b1c5a36bf96c2d2805883ea7f0c27820807a7745a59c9e5a0ae7d0697935501ebcdd4ab26d4bc4ec27900d02562215331c7 SHA512 9335a43b2bcd62a8521c04c1698ef021b839b124a20c00ff8a8c3a4b641273fcbab5938b8f207fbc94e26c03a05e4a213f2a43e64814da1114178951068d2c66
+DIST firefox-95.0-zh-CN.xpi 571142 BLAKE2B ef68a507ae28c7fc9fdae15a3b2f760ed50889245dd3a3c463f170642deb14383feb0bd1a7dcd2806b6c88aca14101b0253879ddc85773a355667e98f8fc7b47 SHA512 006518e8c34db43fc96f371970737751df6a36b95a89172d2934f776c3eda3372cc4fcf674fd81b8a9f4471fe2be7a212a725ea9772dbd0d82b9a1fc56ba75e1
+DIST firefox-95.0-zh-TW.xpi 571955 BLAKE2B a41c01347771a0fe5609ebb61b2046695d9354c35f61e238db116401da8b8b50c31b07ee8455347f6f2714a2ad3fba5dacdaa8cc4b0794e90db16c8ec30741d1 SHA512 68395d78cb17ad8c9ce7b70e23b5f019bfda25e6aebaaaa615babfafdb715dc3c83cff049ae8b9d6c3520919a8fc46cc606b136276af1e86dfb5e82ba3978e7b
+DIST firefox-95.0.source.tar.xz 382853940 BLAKE2B 64ff056f2e8a21731a920a5bc4580d3bc8805b40ac1c0ab3d6cf3811cc1e058ee9363f85a9c8bb086b1bc87462b7feaae565c459edf37417b44cba6e0727dd94 SHA512 350672a2cd99195c67dafc0e71c6eaf1e23e85a5fe92775697119a054f17c34a736035e23d7f2bb404b544f0f144efef3843cfc293596a6e61d1ea36efc3a724
 EBUILD firefox-78.15.0.ebuild 34443 BLAKE2B 568b5626c717137be77371545016e0bfbe22e0b362eb3a6d8654f838c323b48e1f62581f7e90d6d40ae2bdbe13826acefd52c7d426587f8fb1f9b7070fb105bf SHA512 9e8cf9e5f4977dfe4cb0dfeb2a82e481b87a7a6bf3b1ef250966a3c07dee6e43dc44fade1b45e46af8e2eadf6758ed2170214529823654ac83030d14de7d63f9
 EBUILD firefox-91.3.0.ebuild 35240 BLAKE2B 65d11a9187dd728b473dc49a72161c387ff9679596b0877a93da4fcd740b624510d06f48d00b817ada0c35af42d6015f0999848d6509bb6de9c5b8f4e081222e SHA512 bd8a14b93933b49a114fe5ca94c793a704cce19daedcd2a2ffa30057d12fb180d491973c8d3a007d7e7b81a0348f041c5ac04d660af2f5dc2a33f2799dbe4f89
+EBUILD firefox-91.4.0.ebuild 35432 BLAKE2B e00aaf7225bd0eb4ef5adcd01d377c0f53428489c3eefdcc650209bf142b4dcd89f9b6213e9bf2df56ccc535936c098a9a7467fe6497a511ac8f363e0e583d90 SHA512 f7d24090888913ba53f24f3d21f748ab2814e2f4ecdc74b137d47a3c1c46e884e0ddfe9c1d23575e1720e9f21060881eddea6e2aec51d93c2dc9ca96298965fd
 EBUILD firefox-93.0.ebuild 33813 BLAKE2B ef1d5db89c7e39ff7313f922c5a77007553ee3dccc6f4585e3ac9d23f6ea5be7abec9da0464ff2b45ee9a076e3edbbd59a7c5428a0f9b6968f7eb9da1f4e1f79 SHA512 6d1177807e810d75fee3de1bdf3e6c9dcbfb0a66f5fbef1415644707946e6bba292eecb4201ec9d51f3de74e8fd8b30e129902bf7785ac0f3c567fe5946aca78
 EBUILD firefox-94.0.1-r1.ebuild 35237 BLAKE2B 532a23406e19dbaebb68a4ceb7a3f3997bdf798953f807c4c4d7eb94959fd77b29f698dc6e3e0fab34fcc5e9115096c3d51eb653fa3ac9cc577bfdadf392a6ae SHA512 5d7d1bb92df66be935c922ea5419c1385d3efe562661806d83bb87a90052c23455892c9c1fdf6acc44ca7cc030b52b7716513baa1eb62a2261a01a5cd8d3d316
 EBUILD firefox-94.0.2.ebuild 35237 BLAKE2B 532a23406e19dbaebb68a4ceb7a3f3997bdf798953f807c4c4d7eb94959fd77b29f698dc6e3e0fab34fcc5e9115096c3d51eb653fa3ac9cc577bfdadf392a6ae SHA512 5d7d1bb92df66be935c922ea5419c1385d3efe562661806d83bb87a90052c23455892c9c1fdf6acc44ca7cc030b52b7716513baa1eb62a2261a01a5cd8d3d316
+EBUILD firefox-95.0.ebuild 35485 BLAKE2B d007bffd80c8a99ba2e0eb9f532634448a23553082c9c7c6cbe746cff61c13e74d969c1d1682c2aa6e953b946170951a11b58da217adf69c6a898ae2ff4118a4 SHA512 13b32d8248ad5055a00fd0b15619cfcf20a33f6d74d475280d4a40ddbe4a52e073c8e1a5fe82f9a40864fe2f0b6a179223ddca356d71f0f5416553f0d8d09e85
 MISC metadata.xml 2151 BLAKE2B 0dd5df0e78dee99abb7d7fc5a384126ac9920f8f39e886932c894328ab4c235aabf0e7fe401c6859973bb8c55f29bb64ec8cc571b58aa427325cd4b98a89fbf4 SHA512 14e367bb16402e3c3efbed5ed6cf2acd776fd725f4f29f5cbf20f4351ddbb59c89103b9d051fb56912bea461f994fe47741afb6da3b072710eaead0004da2c58
diff --git a/www-client/firefox/firefox-91.4.0.ebuild b/www-client/firefox/firefox-91.4.0.ebuild
new file mode 100644
index 000000000000..fce6b3ab8852
--- /dev/null
+++ b/www-client/firefox/firefox-91.4.0.ebuild
@@ -0,0 +1,1234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-91esr-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/esr$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp"
+IUSE+=" wayland wifi"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver"
+IUSE+=" +gmp-autoupdate"
+IUSE+=" screencast"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	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.51.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.68
+	>=dev-libs/nspr-4.32
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.8.1:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.8.1:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	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 \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# 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 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/firefox/firefox-95.0.ebuild b/www-client/firefox/firefox-95.0.ebuild
new file mode 100644
index 000000000000..aa35fbcd4083
--- /dev/null
+++ b/www-client/firefox/firefox-95.0.ebuild
@@ -0,0 +1,1236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-95-patches-01.tar.xz"
+
+LLVM_MAX_SLOT=13
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{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-webp"
+IUSE+=" wayland wifi"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver"
+IUSE+=" +gmp-autoupdate"
+IUSE+=" screencast"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	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.51.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.72
+	>=dev-libs/nspr-4.32
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	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-69.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )
+	sndio? ( media-sound/sndio )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	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-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable sndio
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# 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 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-misc/Manifest.gz b/www-misc/Manifest.gz
index afa6528feb04..cbaf631831a7 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 1ee116613831..d7b2bcd10abc 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -2,5 +2,5 @@ AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bc
 DIST monitorix-3.12.0.tar.gz 348117 BLAKE2B 65f6e5a8ef4acba2e5dd015e3acab1c927a8964de6cf0bb56a426e6e2dc5843083177591f26db639ed36df798db9659cd6345ca38df4f25fc9a4759e84f0d553 SHA512 7cbdb27df1d84e87f0b99d310d3b3a7c27e369adc82c88e297966e36de82c2f800474447dd628041f2feb89817ee496cbae65a4b0e4942a2f75c900f16ccfcf1
 DIST monitorix-3.13.1.tar.gz 364091 BLAKE2B 0e11d1df2d5cbc4a7ec7b448b24409411903370b5fc0f35f7395439b017d0ce27e3d86fe19db70939942165a9e4bf72583030fdcd1b9c0b5be484c1c71af021e SHA512 224ccedd608cda609ea161f62e11266c13f26536d7e3c50a3690ace693ed52c71422f2ef0acabb4e8d69551458a6af2c33e6b776b1dec73cbf621a7f40339573
 EBUILD monitorix-3.12.0.ebuild 2790 BLAKE2B be1f972e47615d7fcc9f225da6efea482e8390e5a5cf45bdbf3a1607b0aa7d64f0e04bd4c8fe1b774d910880b7dc51afa781d03aa573277670764e80ff06474f SHA512 786b7608dfe1ce3a0802461316ec64f64b46a9f72f067d1767446fd9f075e861c1e66c5b6a6c1a6fed0b2a37bddfe279e870a3785c5d0297d0f05c9636afc483
-EBUILD monitorix-3.13.1.ebuild 2279 BLAKE2B cd57c6f34aa99fc98f4d95889c221164b1924ec436faab02cf5b054acca16d106e2e300d90b53220b18caee18d467275f0a771e351480536692ba91de736687f SHA512 2d930abba77d9f217aec4a06f681e0c6ef55b2c1b290c3dd99558ef8e148416f963332a69c15d9682728f061567eb6ddcc5cc17c4dcf7ef1a2b95ec55c081ce6
+EBUILD monitorix-3.13.1.ebuild 2278 BLAKE2B 856a1cfbd421ad3fc7ed497350d6f50b668655a6b7d49aa88085fc14721d3a50b49f64608ce15c193bec436e1e6bed5ec4dd4103d743afd074822c838d9583bb SHA512 ba4a38a51c01f4e9b3a8afb764e4360169e8afcba21fdec16fb9b5a319710840da9f77ec2b8a8f2023b5e2ec0b1dd52d79c5928f8301da38e3994f95f23ee75c
 MISC metadata.xml 487 BLAKE2B 6dade6679de9045464ce974db2e6b8a44bf64e97d689b566ded1342c5e1f2a578db10a6a95543bc9c2ab5189e33abb780540a2b4a5d0d687cc3c6c6bcbf9deda SHA512 0c0ffb4a7a744795f041f1bd515b73c251cfb11a50227104abde96d4d04bb837fbd1a550fc03c68ccd3414c6950f9addf934ef54b65ab193cd1833b90ced46ab
diff --git a/www-misc/monitorix/monitorix-3.13.1.ebuild b/www-misc/monitorix/monitorix-3.13.1.ebuild
index 7d7155d29bb2..00607f99c0c6 100644
--- a/www-misc/monitorix/monitorix-3.13.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.monitorix.org/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 0b038995c875..4b0808887d31 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index 7579dc36ceed..a479da333cec 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,5 +1,5 @@
 DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
 DIST luit-20210218.tgz 202363 BLAKE2B a7eb88c567125e66b6f257f5f1365cc20cf30a37ec4d172c9d6396f3aebf0e5e505af604df109eebde195dc5152afe50e6ac82f485f3309c852d1dca7cae5f27 SHA512 92bfdfd5b03c73803caaf3ffb1eb92660c6c97c30b7d716454df1b5007af9cf7f75d8f255841a87f8fe266c33bff9af6c1195eb13e5160b7787a3a9e693b21e8
 EBUILD luit-20190106.ebuild 638 BLAKE2B e20f5efaacb29eca2768254115e6d3d3a820e9f0fb24b3621df2a0f3bd721e6e4e1003eccb2d94adbb77a0a154c8f18fae01fe38fb877cf5e152f51f5c5080a8 SHA512 32e422c19cfd3c2040af081db37a03ef99a6d5fc4aeabb95e4e2cd3bd946dfc1aba8602359610b0249573bc385757767d7ca7930f7123affd63d383f24a35194
-EBUILD luit-20210218.ebuild 634 BLAKE2B 3c0fde7ac834a8ac19123511b814891080a3b279b4b600a19ecbc33dbc1ca289d2660ba3ccec91a6ad3c5d19d7024cbb3d0fe9ec03dfc70fd5142afd7553593e SHA512 a1cce0da77bb6bfc2455039e50670eee143a885652a87b7949a3d9a0c46643a21038f3eac947653dc1481a1d0cde1516585b497360b82ac158a80622c10223ac
+EBUILD luit-20210218.ebuild 630 BLAKE2B 38c81a53abac5dc225f4c77db8766fa593d4c161fd943c0d9a596dd4366e3ff6702affb3aea21797e3ea17ef9153384a0286f0b8ae2807126ee53271d365937c SHA512 427e23c78c7aed0af01bff5d389f136e70e1af7ccfed473d51946c69494a96d6d7d679c940342c222a461547feb777c16f2a1465e16da3bacb12084a22a8c7e0
 MISC metadata.xml 266 BLAKE2B 480d87d101d6c5967bb91a576bb1c3702ebf9b6aceafcb69a7a25a89927cdb7fa48a4d305c8636b580c1261497c215c94c9136340ebde6a2f39a49c671d5bc8f SHA512 138e12ed699397d42af1e5b9bcb5c9d94235ff5333192258b93b0b30f0f7a0ba7c321e3c8d4fa79d6da60c3f19286caf01a675e4d9b1f04ed935b93310890cc6
diff --git a/x11-apps/luit/luit-20210218.ebuild b/x11-apps/luit/luit-20210218.ebuild
index 00531de433fa..fc2480e3f601 100644
--- a/x11-apps/luit/luit-20210218.ebuild
+++ b/x11-apps/luit/luit-20210218.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="sys-libs/zlib
 	virtual/libiconv"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a42cbed09277..da27c04ec8cb 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/fbpager/Manifest b/x11-misc/fbpager/Manifest
index 27def1d1b267..45527a859c0b 100644
--- a/x11-misc/fbpager/Manifest
+++ b/x11-misc/fbpager/Manifest
@@ -1,4 +1,4 @@
 DIST fbpager-20090221.tar.bz2 267876 BLAKE2B ed7dea903258544ff1ed3c506c0d01342d5a43b4af035b3b428cb722fa86e1cdd996c9e41e2e197a56fd3bee5eccdb2da3ef00ecfe3fc77c410b958b004e5343 SHA512 fca9a43a3f71b1eb7b27befb3de4b0010f4974cb8898050325bec6def19f1b99a8e549eec04c14ef7777da8d23c25f8e799798160384e08d5a213c9c202bfd7a
 EBUILD fbpager-20090221-r1.ebuild 606 BLAKE2B 365cbd9007a0d8c5c9484712cf1e9059fd7dd29ee038b02914a0c0e0c4c6b7f14a1450af0f01fe6d94bc72cf1c48650d176894cc433d8306f14f202db3944c97 SHA512 751fa29bde4363d79669f0e4a7d0a34813e4f4cb26dbddcfe15c67532274c860288e30e23d0b8056f68aed3cdd1e080acf1581c4bd798a3ae7c0efcadc97b793
-EBUILD fbpager-20090221-r2.ebuild 607 BLAKE2B 92e8a7a6c80dd2d4fe2df96830b6d5e1f2d3d94b7093eb9d3f86956ccb26c394da0a3d9258cf09ff6b7f672c97eed04cc94c10d1d2906188c7de3ebebc2961c0 SHA512 27f3cc8ea1828e527c930373a19366dff28ef3d394885f6df2a2a1cb71dab8551f4ee811543883e308809376d7d1ed1f98a88bb8ee206ab4d9441cee2c40d9ac
+EBUILD fbpager-20090221-r2.ebuild 606 BLAKE2B d971ffc3cef03449b82172f798fc11352f32043a784b8de206900f43dbdc4246319f3e3866c58fd763fb66f06b3d2ad7c91029998e4da756041b085fbacaff92 SHA512 0461605c258af959a835460b743c4f350b52fb2b2996f6f0dbb2bb8731501faf377a1fdf026744aad30e6462550d89672c70fd4c10183526db630b7b6c2404fd
 MISC metadata.xml 277 BLAKE2B 63393f6c4a413ca84016ffdf63e98637e6becf53ad5315664190c622fe6217bb99071fe480423dfe1df7e97af759c71bdf57858a7c0193fadb9abed04cda8c41 SHA512 acf1676742bf9bcfd9357373b20806b93e4f3265ffa4d585ab428d62524bc3977af55fe3a5a344a3b91e528480066d52c75b5393ff173921441e3c2378e0a437
diff --git a/x11-misc/fbpager/fbpager-20090221-r2.ebuild b/x11-misc/fbpager/fbpager-20090221-r2.ebuild
index 01b42c95e421..c56f9d59fa29 100644
--- a/x11-misc/fbpager/fbpager-20090221-r2.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~sparc ~x86"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
 IUSE="+xrender"
 
 DEPEND="x11-libs/libX11
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 812bf8302c33..a87e56faab6a 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,5 +1,5 @@
 DIST shutter-0.99.2.tar.gz 1733886 BLAKE2B 19596b5385a11f179c9fbbf81a97f2a5d9661d52d14f33be72595c26c096548095aa6cdbbc4932413f0a3103b30a78e2e870d2e7e904fb9cf0fd17ee43ad45fb SHA512 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb
 DIST shutter-0.99.tar.gz 1734356 BLAKE2B c261d7792a2a7508fb8e73b968e1e07edbea0338b857132674caee5ec1bb7a3d58eb2e35645c581af652027007a27df6120b035218c41d8671bc53293b6548e7 SHA512 335c85730f49978d4b69ee2d5bbaa5d660d652d386a70618fdeb46c639bd209cee99743b44a8ef1019404f52328692de91bfbe47b14bea202efd089f80d36f82
-EBUILD shutter-0.99.2.ebuild 2159 BLAKE2B 5f827b65e6c014b28579ce94f9405bd14f7a82a578472ef3813c496ac5a5691376bbc8b7bf4a04bc2786a968e28311527f0b5fceceb46417430a46e4881eb6e0 SHA512 0cd07998924c59db93b8bda4695d06409b3e29506d963cabddad46da4dfc4409008317d9ed16d80a2ee296992bca14fadc77dcfd1969f63e135986a55c1559e0
+EBUILD shutter-0.99.2.ebuild 2157 BLAKE2B dab4f4660e5a7f882668bd1100c89511e55d1f42edfbf1743195cd16458e584b58b909ca408b6fb2067a58dfd93137683b47c3dfec66a805dc82394503e0dec8 SHA512 5fdcb0dba8a3dad894677bdeed50f16354951b4afca0e969181aecc9664087c517e39c1a911c1f58159b7804b1c3d2ab0ef9b8c1f8b55d71d821680a843276ab
 EBUILD shutter-0.99.ebuild 2156 BLAKE2B d6462cf8be7f1f84bb51c4db29378c52b63fa7a9fcc0238abeaa89f80cfd13a7bdd9961754517c9600e723ed56997a2c9a9f69bdcd5b6eb90ca728baf70f83a8 SHA512 3402387ead7393b75773829b259f37932b8fcf83a5cb536754ba258767cac71bf0b3bef2105b5062a28e3b20a63fc56bc2943aeae4c7b127e0aaecd70e2ef68a
 MISC metadata.xml 404 BLAKE2B 89b0c69e56bace083baf4e82ff7deb14bddc671f418233e32c268056477328c4a22d427147fde4d3ad6093ad51d9b3c5e64bc28297add868281f1fe25382f450 SHA512 4fe92d2d4e6d8a0179df9c2748f6740d7c8f0cabab18650baab8df6ab1008a61f48fac5f82cf65f3f08341679dc3e554a37ddd98bb5cb0912d0cac4e6302f22d
diff --git a/x11-misc/shutter/shutter-0.99.2.ebuild b/x11-misc/shutter/shutter-0.99.2.ebuild
index 8a35f2c4fbd4..f428414ecaa2 100644
--- a/x11-misc/shutter/shutter-0.99.2.ebuild
+++ b/x11-misc/shutter/shutter-0.99.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b75c981f7548..6bc50b792cf9 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 26b05b8b055e..26190e111460 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -4,5 +4,5 @@ AUX sakura-3.8.3-opacity.patch 571 BLAKE2B 0641cde4fabdc7d6b39ab82116e7999e03224
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
 DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e
 EBUILD sakura-3.7.1.ebuild 1311 BLAKE2B 1eb93b0859ff54d1fae7fd017d4ff0a88e8cccaf65c1292cb7eb27b2223619954828705c0a62ef0c902aecaced3fcda8e9e4c0dfc06e44b06f5f51e8292a8fd9 SHA512 0d92b1ea14ddb4a441d3ce89309d01b0cdd262cf3e22a8df2e0590064ca1fc0bf48f2ab599ede7ccb27bab3482194788547b1b3f712c17872c72d9741b0463b0
-EBUILD sakura-3.8.3.ebuild 866 BLAKE2B 0784ba1e8adc8a7359fed21ee886204670b9f99fc4c18b99f5bfd800544fb6ef067f5cc90f721270ed03f37438597bfc07f420e239c624504aa32718b554cf18 SHA512 1ed8753ad6bde123430db8467f526b4bb9b889c6fc8bb46777034503fa8cf1788264d189c0c3a9c2bfee0038faec61fd7bb370f493c881bb22c3d2f6fd8f7f75
+EBUILD sakura-3.8.3.ebuild 865 BLAKE2B 11d4aff567fd3ab1dd7a3a8be2df654dcd51728c0dc7cb12ed9dc0ee49fd5482a92b61a458745f25d66f21caebeddddab556b6d7346979dc438128bad1096570 SHA512 62ce919e21fe558a0200940e068e0a45ad92f99eb3e0fea6f8e49ba8257443a3604ad28a71a1c2692c9dc975cfa94d5623d932264ca8782b1ced3203a0bcd4b1
 MISC metadata.xml 851 BLAKE2B 823d08b0bc994ef9732b69188f2d6f55bd58709104517313093ee1f5d39fcb40e01a54fe47ab0e80f9b42b523f38129ac2ac0f1fdfb8d08338c3d4bb893914ec SHA512 99c6563360d9326835c2b49d8e77c28c07573c3dc14303f6ed4e1699ddc9ed199cad03ba841556903845a43d245c692ca0909f825c9cbd4a198a56a6b9dee0ae
diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.3.ebuild
index eb5764801c2a..717bbf73513c 100644
--- a/x11-terms/sakura/sakura-3.8.3.ebuild
+++ b/x11-terms/sakura/sakura-3.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 
 RDEPEND="
 	dev-libs/glib:2